diff --git a/nifty2go/__init__.py b/nifty/__init__.py
similarity index 100%
rename from nifty2go/__init__.py
rename to nifty/__init__.py
diff --git a/nifty2go/basic_arithmetics.py b/nifty/basic_arithmetics.py
similarity index 100%
rename from nifty2go/basic_arithmetics.py
rename to nifty/basic_arithmetics.py
diff --git a/nifty2go/domain_object.py b/nifty/domain_object.py
similarity index 100%
rename from nifty2go/domain_object.py
rename to nifty/domain_object.py
diff --git a/nifty2go/domain_tuple.py b/nifty/domain_tuple.py
similarity index 100%
rename from nifty2go/domain_tuple.py
rename to nifty/domain_tuple.py
diff --git a/nifty2go/energies/__init__.py b/nifty/energies/__init__.py
similarity index 100%
rename from nifty2go/energies/__init__.py
rename to nifty/energies/__init__.py
diff --git a/nifty2go/energies/energy.py b/nifty/energies/energy.py
similarity index 100%
rename from nifty2go/energies/energy.py
rename to nifty/energies/energy.py
diff --git a/nifty2go/energies/line_energy.py b/nifty/energies/line_energy.py
similarity index 100%
rename from nifty2go/energies/line_energy.py
rename to nifty/energies/line_energy.py
diff --git a/nifty2go/energies/memoization.py b/nifty/energies/memoization.py
similarity index 100%
rename from nifty2go/energies/memoization.py
rename to nifty/energies/memoization.py
diff --git a/nifty2go/energies/quadratic_energy.py b/nifty/energies/quadratic_energy.py
similarity index 100%
rename from nifty2go/energies/quadratic_energy.py
rename to nifty/energies/quadratic_energy.py
diff --git a/nifty2go/field.py b/nifty/field.py
similarity index 100%
rename from nifty2go/field.py
rename to nifty/field.py
diff --git a/nifty2go/field_types/__init__.py b/nifty/field_types/__init__.py
similarity index 100%
rename from nifty2go/field_types/__init__.py
rename to nifty/field_types/__init__.py
diff --git a/nifty2go/field_types/field_array.py b/nifty/field_types/field_array.py
similarity index 100%
rename from nifty2go/field_types/field_array.py
rename to nifty/field_types/field_array.py
diff --git a/nifty2go/field_types/field_type.py b/nifty/field_types/field_type.py
similarity index 100%
rename from nifty2go/field_types/field_type.py
rename to nifty/field_types/field_type.py
diff --git a/nifty2go/library/__init__.py b/nifty/library/__init__.py
similarity index 100%
rename from nifty2go/library/__init__.py
rename to nifty/library/__init__.py
diff --git a/nifty2go/library/critical_filter/__init__.py b/nifty/library/critical_filter/__init__.py
similarity index 100%
rename from nifty2go/library/critical_filter/__init__.py
rename to nifty/library/critical_filter/__init__.py
diff --git a/nifty2go/library/critical_filter/critical_power_curvature.py b/nifty/library/critical_filter/critical_power_curvature.py
similarity index 100%
rename from nifty2go/library/critical_filter/critical_power_curvature.py
rename to nifty/library/critical_filter/critical_power_curvature.py
diff --git a/nifty2go/library/critical_filter/critical_power_energy.py b/nifty/library/critical_filter/critical_power_energy.py
similarity index 100%
rename from nifty2go/library/critical_filter/critical_power_energy.py
rename to nifty/library/critical_filter/critical_power_energy.py
diff --git a/nifty2go/library/log_normal_wiener_filter/__init__.py b/nifty/library/log_normal_wiener_filter/__init__.py
similarity index 100%
rename from nifty2go/library/log_normal_wiener_filter/__init__.py
rename to nifty/library/log_normal_wiener_filter/__init__.py
diff --git a/nifty2go/library/log_normal_wiener_filter/log_normal_wiener_filter_curvature.py b/nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_curvature.py
similarity index 100%
rename from nifty2go/library/log_normal_wiener_filter/log_normal_wiener_filter_curvature.py
rename to nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_curvature.py
diff --git a/nifty2go/library/log_normal_wiener_filter/log_normal_wiener_filter_energy.py b/nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_energy.py
similarity index 100%
rename from nifty2go/library/log_normal_wiener_filter/log_normal_wiener_filter_energy.py
rename to nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_energy.py
diff --git a/nifty2go/library/wiener_filter/__init__.py b/nifty/library/wiener_filter/__init__.py
similarity index 100%
rename from nifty2go/library/wiener_filter/__init__.py
rename to nifty/library/wiener_filter/__init__.py
diff --git a/nifty2go/library/wiener_filter/wiener_filter_curvature.py b/nifty/library/wiener_filter/wiener_filter_curvature.py
similarity index 100%
rename from nifty2go/library/wiener_filter/wiener_filter_curvature.py
rename to nifty/library/wiener_filter/wiener_filter_curvature.py
diff --git a/nifty2go/library/wiener_filter/wiener_filter_energy.py b/nifty/library/wiener_filter/wiener_filter_energy.py
similarity index 100%
rename from nifty2go/library/wiener_filter/wiener_filter_energy.py
rename to nifty/library/wiener_filter/wiener_filter_energy.py
diff --git a/nifty2go/low_level_library.py b/nifty/low_level_library.py
similarity index 100%
rename from nifty2go/low_level_library.py
rename to nifty/low_level_library.py
diff --git a/nifty2go/minimization/__init__.py b/nifty/minimization/__init__.py
similarity index 100%
rename from nifty2go/minimization/__init__.py
rename to nifty/minimization/__init__.py
diff --git a/nifty2go/minimization/conjugate_gradient.py b/nifty/minimization/conjugate_gradient.py
similarity index 100%
rename from nifty2go/minimization/conjugate_gradient.py
rename to nifty/minimization/conjugate_gradient.py
diff --git a/nifty2go/minimization/default_iteration_controller.py b/nifty/minimization/default_iteration_controller.py
similarity index 100%
rename from nifty2go/minimization/default_iteration_controller.py
rename to nifty/minimization/default_iteration_controller.py
diff --git a/nifty2go/minimization/descent_minimizer.py b/nifty/minimization/descent_minimizer.py
similarity index 100%
rename from nifty2go/minimization/descent_minimizer.py
rename to nifty/minimization/descent_minimizer.py
diff --git a/nifty2go/minimization/iteration_controller.py b/nifty/minimization/iteration_controller.py
similarity index 100%
rename from nifty2go/minimization/iteration_controller.py
rename to nifty/minimization/iteration_controller.py
diff --git a/nifty2go/minimization/line_searching/__init__.py b/nifty/minimization/line_searching/__init__.py
similarity index 100%
rename from nifty2go/minimization/line_searching/__init__.py
rename to nifty/minimization/line_searching/__init__.py
diff --git a/nifty2go/minimization/line_searching/line_search.py b/nifty/minimization/line_searching/line_search.py
similarity index 100%
rename from nifty2go/minimization/line_searching/line_search.py
rename to nifty/minimization/line_searching/line_search.py
diff --git a/nifty2go/minimization/line_searching/line_search_strong_wolfe.py b/nifty/minimization/line_searching/line_search_strong_wolfe.py
similarity index 100%
rename from nifty2go/minimization/line_searching/line_search_strong_wolfe.py
rename to nifty/minimization/line_searching/line_search_strong_wolfe.py
diff --git a/nifty2go/minimization/minimizer.py b/nifty/minimization/minimizer.py
similarity index 100%
rename from nifty2go/minimization/minimizer.py
rename to nifty/minimization/minimizer.py
diff --git a/nifty2go/minimization/nonlinear_cg.py b/nifty/minimization/nonlinear_cg.py
similarity index 100%
rename from nifty2go/minimization/nonlinear_cg.py
rename to nifty/minimization/nonlinear_cg.py
diff --git a/nifty2go/minimization/relaxed_newton.py b/nifty/minimization/relaxed_newton.py
similarity index 100%
rename from nifty2go/minimization/relaxed_newton.py
rename to nifty/minimization/relaxed_newton.py
diff --git a/nifty2go/minimization/steepest_descent.py b/nifty/minimization/steepest_descent.py
similarity index 100%
rename from nifty2go/minimization/steepest_descent.py
rename to nifty/minimization/steepest_descent.py
diff --git a/nifty2go/minimization/vl_bfgs.py b/nifty/minimization/vl_bfgs.py
similarity index 100%
rename from nifty2go/minimization/vl_bfgs.py
rename to nifty/minimization/vl_bfgs.py
diff --git a/nifty2go/nifty_meta.py b/nifty/nifty_meta.py
similarity index 100%
rename from nifty2go/nifty_meta.py
rename to nifty/nifty_meta.py
diff --git a/nifty2go/nifty_utilities.py b/nifty/nifty_utilities.py
similarity index 100%
rename from nifty2go/nifty_utilities.py
rename to nifty/nifty_utilities.py
diff --git a/nifty2go/operators/__init__.py b/nifty/operators/__init__.py
similarity index 100%
rename from nifty2go/operators/__init__.py
rename to nifty/operators/__init__.py
diff --git a/nifty2go/operators/composed_operator/__init__.py b/nifty/operators/composed_operator/__init__.py
similarity index 100%
rename from nifty2go/operators/composed_operator/__init__.py
rename to nifty/operators/composed_operator/__init__.py
diff --git a/nifty2go/operators/composed_operator/composed_operator.py b/nifty/operators/composed_operator/composed_operator.py
similarity index 100%
rename from nifty2go/operators/composed_operator/composed_operator.py
rename to nifty/operators/composed_operator/composed_operator.py
diff --git a/nifty2go/operators/diagonal_operator/__init__.py b/nifty/operators/diagonal_operator/__init__.py
similarity index 100%
rename from nifty2go/operators/diagonal_operator/__init__.py
rename to nifty/operators/diagonal_operator/__init__.py
diff --git a/nifty2go/operators/diagonal_operator/diagonal_operator.py b/nifty/operators/diagonal_operator/diagonal_operator.py
similarity index 100%
rename from nifty2go/operators/diagonal_operator/diagonal_operator.py
rename to nifty/operators/diagonal_operator/diagonal_operator.py
diff --git a/nifty2go/operators/endomorphic_operator/__init__.py b/nifty/operators/endomorphic_operator/__init__.py
similarity index 100%
rename from nifty2go/operators/endomorphic_operator/__init__.py
rename to nifty/operators/endomorphic_operator/__init__.py
diff --git a/nifty2go/operators/endomorphic_operator/endomorphic_operator.py b/nifty/operators/endomorphic_operator/endomorphic_operator.py
similarity index 100%
rename from nifty2go/operators/endomorphic_operator/endomorphic_operator.py
rename to nifty/operators/endomorphic_operator/endomorphic_operator.py
diff --git a/nifty2go/operators/fft_operator/__init__.py b/nifty/operators/fft_operator/__init__.py
similarity index 100%
rename from nifty2go/operators/fft_operator/__init__.py
rename to nifty/operators/fft_operator/__init__.py
diff --git a/nifty2go/operators/fft_operator/fft_operator.py b/nifty/operators/fft_operator/fft_operator.py
similarity index 100%
rename from nifty2go/operators/fft_operator/fft_operator.py
rename to nifty/operators/fft_operator/fft_operator.py
diff --git a/nifty2go/operators/fft_operator/fft_operator_support.py b/nifty/operators/fft_operator/fft_operator_support.py
similarity index 100%
rename from nifty2go/operators/fft_operator/fft_operator_support.py
rename to nifty/operators/fft_operator/fft_operator_support.py
diff --git a/nifty2go/operators/invertible_operator_mixin/__init__.py b/nifty/operators/invertible_operator_mixin/__init__.py
similarity index 100%
rename from nifty2go/operators/invertible_operator_mixin/__init__.py
rename to nifty/operators/invertible_operator_mixin/__init__.py
diff --git a/nifty2go/operators/invertible_operator_mixin/invertible_operator_mixin.py b/nifty/operators/invertible_operator_mixin/invertible_operator_mixin.py
similarity index 100%
rename from nifty2go/operators/invertible_operator_mixin/invertible_operator_mixin.py
rename to nifty/operators/invertible_operator_mixin/invertible_operator_mixin.py
diff --git a/nifty2go/operators/laplace_operator/__init__.py b/nifty/operators/laplace_operator/__init__.py
similarity index 100%
rename from nifty2go/operators/laplace_operator/__init__.py
rename to nifty/operators/laplace_operator/__init__.py
diff --git a/nifty2go/operators/laplace_operator/laplace_operator.py b/nifty/operators/laplace_operator/laplace_operator.py
similarity index 100%
rename from nifty2go/operators/laplace_operator/laplace_operator.py
rename to nifty/operators/laplace_operator/laplace_operator.py
diff --git a/nifty2go/operators/linear_operator/__init__.py b/nifty/operators/linear_operator/__init__.py
similarity index 100%
rename from nifty2go/operators/linear_operator/__init__.py
rename to nifty/operators/linear_operator/__init__.py
diff --git a/nifty2go/operators/linear_operator/linear_operator.py b/nifty/operators/linear_operator/linear_operator.py
similarity index 100%
rename from nifty2go/operators/linear_operator/linear_operator.py
rename to nifty/operators/linear_operator/linear_operator.py
diff --git a/nifty2go/operators/projection_operator/__init__.py b/nifty/operators/projection_operator/__init__.py
similarity index 100%
rename from nifty2go/operators/projection_operator/__init__.py
rename to nifty/operators/projection_operator/__init__.py
diff --git a/nifty2go/operators/projection_operator/projection_operator.py b/nifty/operators/projection_operator/projection_operator.py
similarity index 100%
rename from nifty2go/operators/projection_operator/projection_operator.py
rename to nifty/operators/projection_operator/projection_operator.py
diff --git a/nifty2go/operators/response_operator/__init__.py b/nifty/operators/response_operator/__init__.py
similarity index 100%
rename from nifty2go/operators/response_operator/__init__.py
rename to nifty/operators/response_operator/__init__.py
diff --git a/nifty2go/operators/response_operator/response_operator.py b/nifty/operators/response_operator/response_operator.py
similarity index 100%
rename from nifty2go/operators/response_operator/response_operator.py
rename to nifty/operators/response_operator/response_operator.py
diff --git a/nifty2go/operators/smoothing_operator/__init__.py b/nifty/operators/smoothing_operator/__init__.py
similarity index 100%
rename from nifty2go/operators/smoothing_operator/__init__.py
rename to nifty/operators/smoothing_operator/__init__.py
diff --git a/nifty2go/operators/smoothing_operator/direct_smoothing_operator.py b/nifty/operators/smoothing_operator/direct_smoothing_operator.py
similarity index 100%
rename from nifty2go/operators/smoothing_operator/direct_smoothing_operator.py
rename to nifty/operators/smoothing_operator/direct_smoothing_operator.py
diff --git a/nifty2go/operators/smoothing_operator/fft_smoothing_operator.py b/nifty/operators/smoothing_operator/fft_smoothing_operator.py
similarity index 100%
rename from nifty2go/operators/smoothing_operator/fft_smoothing_operator.py
rename to nifty/operators/smoothing_operator/fft_smoothing_operator.py
diff --git a/nifty2go/operators/smoothness_operator/__init__.py b/nifty/operators/smoothness_operator/__init__.py
similarity index 100%
rename from nifty2go/operators/smoothness_operator/__init__.py
rename to nifty/operators/smoothness_operator/__init__.py
diff --git a/nifty2go/operators/smoothness_operator/smoothness_operator.py b/nifty/operators/smoothness_operator/smoothness_operator.py
similarity index 100%
rename from nifty2go/operators/smoothness_operator/smoothness_operator.py
rename to nifty/operators/smoothness_operator/smoothness_operator.py
diff --git a/nifty2go/plotting/__init__.py b/nifty/plotting/__init__.py
similarity index 100%
rename from nifty2go/plotting/__init__.py
rename to nifty/plotting/__init__.py
diff --git a/nifty2go/plotting/plot.py b/nifty/plotting/plot.py
similarity index 100%
rename from nifty2go/plotting/plot.py
rename to nifty/plotting/plot.py
diff --git a/nifty2go/probing/__init__.py b/nifty/probing/__init__.py
similarity index 100%
rename from nifty2go/probing/__init__.py
rename to nifty/probing/__init__.py
diff --git a/nifty2go/probing/mixin_classes/__init__.py b/nifty/probing/mixin_classes/__init__.py
similarity index 100%
rename from nifty2go/probing/mixin_classes/__init__.py
rename to nifty/probing/mixin_classes/__init__.py
diff --git a/nifty2go/probing/mixin_classes/diagonal_prober_mixin.py b/nifty/probing/mixin_classes/diagonal_prober_mixin.py
similarity index 100%
rename from nifty2go/probing/mixin_classes/diagonal_prober_mixin.py
rename to nifty/probing/mixin_classes/diagonal_prober_mixin.py
diff --git a/nifty2go/probing/mixin_classes/trace_prober_mixin.py b/nifty/probing/mixin_classes/trace_prober_mixin.py
similarity index 100%
rename from nifty2go/probing/mixin_classes/trace_prober_mixin.py
rename to nifty/probing/mixin_classes/trace_prober_mixin.py
diff --git a/nifty2go/probing/prober/__init__.py b/nifty/probing/prober/__init__.py
similarity index 100%
rename from nifty2go/probing/prober/__init__.py
rename to nifty/probing/prober/__init__.py
diff --git a/nifty2go/probing/prober/prober.py b/nifty/probing/prober/prober.py
similarity index 100%
rename from nifty2go/probing/prober/prober.py
rename to nifty/probing/prober/prober.py
diff --git a/nifty2go/random.py b/nifty/random.py
similarity index 100%
rename from nifty2go/random.py
rename to nifty/random.py
diff --git a/nifty2go/spaces/__init__.py b/nifty/spaces/__init__.py
similarity index 100%
rename from nifty2go/spaces/__init__.py
rename to nifty/spaces/__init__.py
diff --git a/nifty2go/spaces/gl_space/__init__.py b/nifty/spaces/gl_space/__init__.py
similarity index 100%
rename from nifty2go/spaces/gl_space/__init__.py
rename to nifty/spaces/gl_space/__init__.py
diff --git a/nifty2go/spaces/gl_space/gl_space.py b/nifty/spaces/gl_space/gl_space.py
similarity index 100%
rename from nifty2go/spaces/gl_space/gl_space.py
rename to nifty/spaces/gl_space/gl_space.py
diff --git a/nifty2go/spaces/hp_space/__init__.py b/nifty/spaces/hp_space/__init__.py
similarity index 100%
rename from nifty2go/spaces/hp_space/__init__.py
rename to nifty/spaces/hp_space/__init__.py
diff --git a/nifty2go/spaces/hp_space/hp_space.py b/nifty/spaces/hp_space/hp_space.py
similarity index 100%
rename from nifty2go/spaces/hp_space/hp_space.py
rename to nifty/spaces/hp_space/hp_space.py
diff --git a/nifty2go/spaces/lm_space/__init__.py b/nifty/spaces/lm_space/__init__.py
similarity index 100%
rename from nifty2go/spaces/lm_space/__init__.py
rename to nifty/spaces/lm_space/__init__.py
diff --git a/nifty2go/spaces/lm_space/lm_space.py b/nifty/spaces/lm_space/lm_space.py
similarity index 100%
rename from nifty2go/spaces/lm_space/lm_space.py
rename to nifty/spaces/lm_space/lm_space.py
diff --git a/nifty2go/spaces/power_space/__init__.py b/nifty/spaces/power_space/__init__.py
similarity index 100%
rename from nifty2go/spaces/power_space/__init__.py
rename to nifty/spaces/power_space/__init__.py
diff --git a/nifty2go/spaces/power_space/power_space.py b/nifty/spaces/power_space/power_space.py
similarity index 100%
rename from nifty2go/spaces/power_space/power_space.py
rename to nifty/spaces/power_space/power_space.py
diff --git a/nifty2go/spaces/rg_space/__init__.py b/nifty/spaces/rg_space/__init__.py
similarity index 100%
rename from nifty2go/spaces/rg_space/__init__.py
rename to nifty/spaces/rg_space/__init__.py
diff --git a/nifty2go/spaces/rg_space/rg_space.py b/nifty/spaces/rg_space/rg_space.py
similarity index 100%
rename from nifty2go/spaces/rg_space/rg_space.py
rename to nifty/spaces/rg_space/rg_space.py
diff --git a/nifty2go/spaces/space/__init__.py b/nifty/spaces/space/__init__.py
similarity index 100%
rename from nifty2go/spaces/space/__init__.py
rename to nifty/spaces/space/__init__.py
diff --git a/nifty2go/spaces/space/space.py b/nifty/spaces/space/space.py
similarity index 100%
rename from nifty2go/spaces/space/space.py
rename to nifty/spaces/space/space.py
diff --git a/nifty2go/sugar.py b/nifty/sugar.py
similarity index 100%
rename from nifty2go/sugar.py
rename to nifty/sugar.py
diff --git a/nifty2go/version.py b/nifty/version.py
similarity index 100%
rename from nifty2go/version.py
rename to nifty/version.py
diff --git a/setup.py b/setup.py
index 585f9cfccb0c8bdc5de6c3c8f3e85652b6df8b1d..f42aaeb23ced13daea823a1a0cbd3ede33975795 100644
--- a/setup.py
+++ b/setup.py
@@ -16,10 +16,9 @@
 # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
-from setuptools import setup, find_packages
-
-exec(open('nifty2go/version.py').read())
+from setuptools import setup
 
+exec(open('nifty/version.py').read())
 
 setup(name="nifty2go",
       version=__version__,
@@ -27,7 +26,8 @@ setup(name="nifty2go",
       author_email="theos@mpa-garching.mpg.de",
       description="Numerical Information Field Theory",
       url="http://www.mpa-garching.mpg.de/ift/nifty/",
-      packages=find_packages(include=["nifty2go", "nifty2go.*"]),
+      package_dir = {"nifty2go": "nifty"},
+      packages=["nifty2go"],
       zip_safe=False,
       dependency_links=[
                'git+https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git@setuptools_test#egg=pyHealpix-0.0.1'],