diff --git a/nifty/basic_arithmetics.py b/nifty/basic_arithmetics.py
index 4cabd0588f5cf87eb5780632a29cb78c77102dd4..f261abf9a6461b4e5ebc2518aac37ab56ea411db 100644
--- a/nifty/basic_arithmetics.py
+++ b/nifty/basic_arithmetics.py
@@ -19,7 +19,7 @@
 from __future__ import division
 import numpy as np
 from d2o import distributed_data_object
-from nifty.field import Field
+from .field import Field
 
 
 __all__ = ['cos', 'sin', 'cosh', 'sinh', 'tan', 'tanh', 'arccos', 'arcsin',
diff --git a/nifty/domain_object.py b/nifty/domain_object.py
index d7e6706825c60b7ef05f1795e08618c451ef31bb..efa896bcb6051416bc2d0ae2d2e2c0b45dfe5710 100644
--- a/nifty/domain_object.py
+++ b/nifty/domain_object.py
@@ -18,7 +18,7 @@
 
 from __future__ import division
 import abc
-from nifty.nifty_meta import NiftyMeta
+from .nifty_meta import NiftyMeta
 
 from keepers import Loggable,\
                     Versionable
diff --git a/nifty/field.py b/nifty/field.py
index c139d79afa7f3a159206a54a6573f9c1825f78cd..a6f88acc09a7cdd00de4569ff6fdd09816886db4 100644
--- a/nifty/field.py
+++ b/nifty/field.py
@@ -30,14 +30,14 @@ from keepers import Versionable,\
 from d2o import distributed_data_object,\
     STRATEGIES as DISTRIBUTION_STRATEGIES
 
-from nifty.config import nifty_configuration as gc
+from .config import nifty_configuration as gc
 
-from nifty.domain_object import DomainObject
+from .domain_object import DomainObject
 
-from nifty.spaces.power_space import PowerSpace
+from .spaces.power_space import PowerSpace
 
-import nifty.nifty_utilities as utilities
-from nifty.random import Random
+from . import nifty_utilities as utilities
+from .random import Random
 from functools import reduce
 
 
diff --git a/nifty/operators/composed_operator/composed_operator.py b/nifty/operators/composed_operator/composed_operator.py
index 405be4a8d8cdb37b2f67c47fe834f14c5eeffdb1..87c83a6670364bce5628633c4ecd9fecccde0681 100644
--- a/nifty/operators/composed_operator/composed_operator.py
+++ b/nifty/operators/composed_operator/composed_operator.py
@@ -17,7 +17,7 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from builtins import range
-from nifty.operators.linear_operator import LinearOperator
+from ..linear_operator import LinearOperator
 
 
 class ComposedOperator(LinearOperator):
diff --git a/nifty/operators/diagonal_operator/diagonal_operator.py b/nifty/operators/diagonal_operator/diagonal_operator.py
index c07c6ec57171add73a7b0c33b47a01efeadca9fa..e6c33253180ee803fbbb528ed1191e786d06798f 100644
--- a/nifty/operators/diagonal_operator/diagonal_operator.py
+++ b/nifty/operators/diagonal_operator/diagonal_operator.py
@@ -23,10 +23,10 @@ import numpy as np
 from d2o import distributed_data_object,\
                 STRATEGIES as DISTRIBUTION_STRATEGIES
 
-from nifty.basic_arithmetics import log as nifty_log
-from nifty.config import nifty_configuration as gc
-from nifty.field import Field
-from nifty.operators.endomorphic_operator import EndomorphicOperator
+from ...basic_arithmetics import log as nifty_log
+from ...config import nifty_configuration as gc
+from ...field import Field
+from ..endomorphic_operator import EndomorphicOperator
 
 
 class DiagonalOperator(EndomorphicOperator):
diff --git a/nifty/operators/endomorphic_operator/endomorphic_operator.py b/nifty/operators/endomorphic_operator/endomorphic_operator.py
index e5ed46862786245629603a577a57e6594a1dd1e0..bbd3a74ffc34acb3efc26e089c980a0bd3bc357e 100644
--- a/nifty/operators/endomorphic_operator/endomorphic_operator.py
+++ b/nifty/operators/endomorphic_operator/endomorphic_operator.py
@@ -18,7 +18,7 @@
 
 import abc
 
-from nifty.operators.linear_operator import LinearOperator
+from ..linear_operator import LinearOperator
 
 
 class EndomorphicOperator(LinearOperator):
diff --git a/nifty/operators/fft_operator/fft_operator.py b/nifty/operators/fft_operator/fft_operator.py
index ad9eb497cc582e1c42d708cc28439726c32026df..40debb7027a0b1d85e8d60a99e475188090e9537 100644
--- a/nifty/operators/fft_operator/fft_operator.py
+++ b/nifty/operators/fft_operator/fft_operator.py
@@ -18,13 +18,13 @@
 
 import numpy as np
 
-import nifty.nifty_utilities as utilities
-from nifty.spaces import RGSpace,\
-                         GLSpace,\
-                         HPSpace,\
-                         LMSpace
+from ... import nifty_utilities as utilities
+from ...spaces import RGSpace,\
+                      GLSpace,\
+                      HPSpace,\
+                      LMSpace
 
-from nifty.operators.linear_operator import LinearOperator
+from ..linear_operator import LinearOperator
 from .transformations import RGRGTransformation,\
                             LMGLTransformation,\
                             LMHPTransformation,\
diff --git a/nifty/operators/fft_operator/transformations/gllmtransformation.py b/nifty/operators/fft_operator/transformations/gllmtransformation.py
index 56303f08a8b4e5573b628969053b01ea2f89eddc..57f61790985c905f5a21b7fcbde754422ad0231a 100644
--- a/nifty/operators/fft_operator/transformations/gllmtransformation.py
+++ b/nifty/operators/fft_operator/transformations/gllmtransformation.py
@@ -18,8 +18,8 @@
 
 import numpy as np
 
-from nifty.config import dependency_injector as gdi
-from nifty import GLSpace, LMSpace
+from ....config import dependency_injector as gdi
+from .... import GLSpace, LMSpace
 from .slicing_transformation import SlicingTransformation
 from . import lm_transformation_helper
 
diff --git a/nifty/operators/fft_operator/transformations/hplmtransformation.py b/nifty/operators/fft_operator/transformations/hplmtransformation.py
index 4698bfaa413fd1048daa7fe082654c1070868fbf..dccefd4851b9bee13d8dd3b3943a739d4be83fe7 100644
--- a/nifty/operators/fft_operator/transformations/hplmtransformation.py
+++ b/nifty/operators/fft_operator/transformations/hplmtransformation.py
@@ -18,8 +18,8 @@
 
 import numpy as np
 
-from nifty.config import dependency_injector as gdi
-from nifty import HPSpace, LMSpace
+from ....config import dependency_injector as gdi
+from .... import HPSpace, LMSpace
 from .slicing_transformation import SlicingTransformation
 
 from . import lm_transformation_helper
diff --git a/nifty/operators/fft_operator/transformations/lmgltransformation.py b/nifty/operators/fft_operator/transformations/lmgltransformation.py
index 9b034a3e1059784c804ee10b833b978aca323488..36b46d970f90d8abf1b4591b32b31b0baff37882 100644
--- a/nifty/operators/fft_operator/transformations/lmgltransformation.py
+++ b/nifty/operators/fft_operator/transformations/lmgltransformation.py
@@ -17,8 +17,8 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 import numpy as np
-from nifty.config import dependency_injector as gdi
-from nifty import GLSpace, LMSpace
+from ....config import dependency_injector as gdi
+from .... import GLSpace, LMSpace
 
 from .slicing_transformation import SlicingTransformation
 from . import lm_transformation_helper
diff --git a/nifty/operators/fft_operator/transformations/lmhptransformation.py b/nifty/operators/fft_operator/transformations/lmhptransformation.py
index ab24c879dbd32380568009525925662824535cf8..7605a7f94b575237e9dbe96f6b372ed22319a58c 100644
--- a/nifty/operators/fft_operator/transformations/lmhptransformation.py
+++ b/nifty/operators/fft_operator/transformations/lmhptransformation.py
@@ -17,8 +17,8 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 import numpy as np
-from nifty.config import dependency_injector as gdi
-from nifty import HPSpace, LMSpace
+from ....config import dependency_injector as gdi
+from .... import HPSpace, LMSpace
 from .slicing_transformation import SlicingTransformation
 from . import lm_transformation_helper
 
diff --git a/nifty/operators/fft_operator/transformations/rg_transforms.py b/nifty/operators/fft_operator/transformations/rg_transforms.py
index 949b0630e6c0f6eed2cfc833d07e8575938af605..20c71f646d0d1fdbcf4bfa3a14695f5428da5b2b 100644
--- a/nifty/operators/fft_operator/transformations/rg_transforms.py
+++ b/nifty/operators/fft_operator/transformations/rg_transforms.py
@@ -22,8 +22,8 @@ import warnings
 
 import numpy as np
 from d2o import distributed_data_object, STRATEGIES
-from nifty.config import dependency_injector as gdi
-import nifty.nifty_utilities as utilities
+from ....config import dependency_injector as gdi
+from .... import nifty_utilities as utilities
 
 from keepers import Loggable
 from functools import reduce
diff --git a/nifty/operators/fft_operator/transformations/rgrgtransformation.py b/nifty/operators/fft_operator/transformations/rgrgtransformation.py
index a732752657fdbb66f0c309eeb0b95cdbee6e8118..47b14e658eed5f9cdb63b317047358918e5bba58 100644
--- a/nifty/operators/fft_operator/transformations/rgrgtransformation.py
+++ b/nifty/operators/fft_operator/transformations/rgrgtransformation.py
@@ -20,7 +20,7 @@ from __future__ import division
 import numpy as np
 from .transformation import Transformation
 from .rg_transforms import MPIFFT, SerialFFT
-from nifty import RGSpace, nifty_configuration
+from .... import RGSpace, nifty_configuration
 
 
 class RGRGTransformation(Transformation):
diff --git a/nifty/operators/fft_operator/transformations/slicing_transformation.py b/nifty/operators/fft_operator/transformations/slicing_transformation.py
index 3f4e06047769dfee917d7838499ca968cebb502c..36a953b19507a85d4465ef3c1e041776ef64a6d8 100644
--- a/nifty/operators/fft_operator/transformations/slicing_transformation.py
+++ b/nifty/operators/fft_operator/transformations/slicing_transformation.py
@@ -19,7 +19,7 @@
 import abc
 import numpy as np
 
-import nifty.nifty_utilities as utilities
+from .... import nifty_utilities as utilities
 from .transformation import Transformation
 
 
diff --git a/nifty/spaces/gl_space/gl_space.py b/nifty/spaces/gl_space/gl_space.py
index e647947922eb80fc4819781abee78f38dac1d3b3..c2ecb4c91faec2e1da88521904014ee019628697 100644
--- a/nifty/spaces/gl_space/gl_space.py
+++ b/nifty/spaces/gl_space/gl_space.py
@@ -21,8 +21,8 @@ from __future__ import division
 import itertools
 import numpy as np
 
-from nifty.spaces.space import Space
-from nifty.config import dependency_injector as gdi
+from ..space import Space
+from ...config import dependency_injector as gdi
 
 pyHealpix = gdi.get('pyHealpix')
 
diff --git a/nifty/spaces/hp_space/hp_space.py b/nifty/spaces/hp_space/hp_space.py
index 7f132f6fe891ea8f1184b829de60a9bcccf7f0ee..8a8ccdbb88c1a2667d9d73deb61d530c4f0faaf4 100644
--- a/nifty/spaces/hp_space/hp_space.py
+++ b/nifty/spaces/hp_space/hp_space.py
@@ -19,7 +19,7 @@
 from __future__ import division
 import numpy as np
 
-from nifty.spaces.space import Space
+from ..space import Space
 
 
 class HPSpace(Space):
diff --git a/nifty/spaces/lm_space/lm_space.py b/nifty/spaces/lm_space/lm_space.py
index c542339fc7e27e8757e3fb566841105a31b57401..5e98c8cefdd4c2dcfca1a779c893ff3cae425e48 100644
--- a/nifty/spaces/lm_space/lm_space.py
+++ b/nifty/spaces/lm_space/lm_space.py
@@ -20,7 +20,7 @@ from __future__ import division
 
 import numpy as np
 
-from nifty.spaces.space import Space
+from ..space import Space
 
 from d2o import arange
 
diff --git a/nifty/spaces/power_space/power_space.py b/nifty/spaces/power_space/power_space.py
index d607fd484a089c8b49edb14d7db955bba5fb871c..d96ff42cd09dc5dd4e4d622c4c8dafc607fef136 100644
--- a/nifty/spaces/power_space/power_space.py
+++ b/nifty/spaces/power_space/power_space.py
@@ -23,7 +23,7 @@ import d2o
 
 from .power_index_factory import PowerIndexFactory
 
-from nifty.spaces.space import Space
+from ..space import Space
 from functools import reduce
 
 
diff --git a/nifty/spaces/rg_space/rg_space.py b/nifty/spaces/rg_space/rg_space.py
index 7eda1a85de44f22490fbeb5c6723cc3f6e9cb96a..d4658c181bc980566546ff48c5cc797299dd21cb 100644
--- a/nifty/spaces/rg_space/rg_space.py
+++ b/nifty/spaces/rg_space/rg_space.py
@@ -36,7 +36,7 @@ import numpy as np
 from d2o import distributed_data_object,\
                 STRATEGIES as DISTRIBUTION_STRATEGIES
 
-from nifty.spaces.space import Space
+from ..space import Space
 from functools import reduce
 
 
diff --git a/nifty/spaces/space/space.py b/nifty/spaces/space/space.py
index dc49c0c4c1d158c3b6d20917ccd652c848299f4e..8b514613a1732c8d1038d09df9559ee6b0a84f83 100644
--- a/nifty/spaces/space/space.py
+++ b/nifty/spaces/space/space.py
@@ -18,7 +18,7 @@
 
 import abc
 
-from nifty.domain_object import DomainObject
+from ...domain_object import DomainObject
 
 
 class Space(DomainObject):
diff --git a/nifty/sugar.py b/nifty/sugar.py
index 1738293570da6cf48f5fc4ff6165e4874222cdd1..a2a7ce0bd268659b4ab8cde5bdefa70414ea0e98 100644
--- a/nifty/sugar.py
+++ b/nifty/sugar.py
@@ -16,9 +16,9 @@
 # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
-from nifty import PowerSpace,\
-                  Field,\
-                  DiagonalOperator
+from . import PowerSpace,\
+              Field,\
+              DiagonalOperator
 
 __all__ = ['create_power_operator']
 
diff --git a/test/__init__.py b/test/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000