diff --git a/nifty/library/__init__.py b/nifty/library/__init__.py
index 2092e920907c77a8b918b8428fc02a8f6af7eb2c..a16068b75f7fe021d27e03759d26533d84daeda0 100644
--- a/nifty/library/__init__.py
+++ b/nifty/library/__init__.py
@@ -1,3 +1,6 @@
-from .critical_filter import *
-from .log_normal_wiener_filter import *
-from .wiener_filter import *
+from .critical_power_energy import CriticalPowerEnergy
+from .critical_power_curvature import CriticalPowerCurvature
+from .log_normal_wiener_filter_energy import LogNormalWienerFilterEnergy
+from .log_normal_wiener_filter_curvature import LogNormalWienerFilterCurvature
+from .wiener_filter_energy import WienerFilterEnergy
+from .wiener_filter_curvature import WienerFilterCurvature
diff --git a/nifty/library/critical_filter/__init__.py b/nifty/library/critical_filter/__init__.py
deleted file mode 100644
index c4d173b5d1be9db8e3263946e5c0a4a706c9661d..0000000000000000000000000000000000000000
--- a/nifty/library/critical_filter/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from .critical_power_curvature import CriticalPowerCurvature
-from .critical_power_energy import CriticalPowerEnergy
diff --git a/nifty/library/critical_filter/critical_power_curvature.py b/nifty/library/critical_power_curvature.py
similarity index 89%
rename from nifty/library/critical_filter/critical_power_curvature.py
rename to nifty/library/critical_power_curvature.py
index ae8bb6a9bff22349f9675cdfcd516f8a1791d519..e3756a4a5642faf0f9f3ec4bb003ff599205394e 100644
--- a/nifty/library/critical_filter/critical_power_curvature.py
+++ b/nifty/library/critical_power_curvature.py
@@ -1,5 +1,5 @@
-from ...operators.endomorphic_operator import EndomorphicOperator
-from ...operators.diagonal_operator import DiagonalOperator
+from ..operators.endomorphic_operator import EndomorphicOperator
+from ..operators.diagonal_operator import DiagonalOperator
 
 
 class CriticalPowerCurvature(EndomorphicOperator):
diff --git a/nifty/library/critical_filter/critical_power_energy.py b/nifty/library/critical_power_energy.py
similarity index 92%
rename from nifty/library/critical_filter/critical_power_energy.py
rename to nifty/library/critical_power_energy.py
index 01951f438ff8f9d8c6ca77abbc27a214d3253835..88f554aaceb5f08836385994058a7d89e9ab532a 100644
--- a/nifty/library/critical_filter/critical_power_energy.py
+++ b/nifty/library/critical_power_energy.py
@@ -1,11 +1,11 @@
-from ...minimization.energy import Energy
-from ...operators.smoothness_operator import SmoothnessOperator
-from ...operators.power_projection_operator import PowerProjectionOperator
-from ...operators.inversion_enabler import InversionEnabler
-from . import CriticalPowerCurvature
-from ...utilities import memo
-from ... import Field, exp
-from ...sugar import generate_posterior_sample
+from ..minimization.energy import Energy
+from ..operators.smoothness_operator import SmoothnessOperator
+from ..operators.power_projection_operator import PowerProjectionOperator
+from ..operators.inversion_enabler import InversionEnabler
+from .critical_power_curvature import CriticalPowerCurvature
+from ..utilities import memo
+from .. import Field, exp
+from ..sugar import generate_posterior_sample
 
 
 class CriticalPowerEnergy(Energy):
diff --git a/nifty/library/log_normal_wiener_filter/__init__.py b/nifty/library/log_normal_wiener_filter/__init__.py
deleted file mode 100644
index 3009fd935fb0bdf89284d23bbb19a744bf096f66..0000000000000000000000000000000000000000
--- a/nifty/library/log_normal_wiener_filter/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from .log_normal_wiener_filter_curvature import LogNormalWienerFilterCurvature
-from .log_normal_wiener_filter_energy import LogNormalWienerFilterEnergy
diff --git a/nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_curvature.py b/nifty/library/log_normal_wiener_filter_curvature.py
similarity index 93%
rename from nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_curvature.py
rename to nifty/library/log_normal_wiener_filter_curvature.py
index add9cc58ff255271e8fa87e066cb7126e8370918..40bf9da93f18ddc4dbb831418071cb420029035d 100644
--- a/nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_curvature.py
+++ b/nifty/library/log_normal_wiener_filter_curvature.py
@@ -1,7 +1,7 @@
-from ...operators import EndomorphicOperator
-from ...utilities import memo
-from ...basic_arithmetics import exp
-from ...sugar import create_composed_fft_operator
+from ..operators import EndomorphicOperator
+from ..utilities import memo
+from ..basic_arithmetics import exp
+from ..sugar import create_composed_fft_operator
 
 
 class LogNormalWienerFilterCurvature(EndomorphicOperator):
diff --git a/nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_energy.py b/nifty/library/log_normal_wiener_filter_energy.py
similarity index 88%
rename from nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_energy.py
rename to nifty/library/log_normal_wiener_filter_energy.py
index c114d4c81945339faa6bde477535cc32e16233ff..4b1d2ecf433c2b9a88cd36d967085c215ddd1b65 100644
--- a/nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_energy.py
+++ b/nifty/library/log_normal_wiener_filter_energy.py
@@ -1,8 +1,9 @@
-from ...minimization.energy import Energy
-from ...utilities import memo
-from . import LogNormalWienerFilterCurvature
-from ...sugar import create_composed_fft_operator
-from ...operators.inversion_enabler import InversionEnabler
+from ..minimization.energy import Energy
+from ..utilities import memo
+from .log_normal_wiener_filter_curvature import LogNormalWienerFilterCurvature
+from ..sugar import create_composed_fft_operator
+from ..operators.inversion_enabler import InversionEnabler
+
 
 class LogNormalWienerFilterEnergy(Energy):
     """The Energy for the log-normal Wiener filter.
diff --git a/nifty/library/wiener_filter/__init__.py b/nifty/library/wiener_filter/__init__.py
deleted file mode 100644
index 174853bd216b4b9adb2c29119f66f03ddf448951..0000000000000000000000000000000000000000
--- a/nifty/library/wiener_filter/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from .wiener_filter_curvature import WienerFilterCurvature
-from .wiener_filter_energy import WienerFilterEnergy
diff --git a/nifty/library/wiener_filter/wiener_filter_curvature.py b/nifty/library/wiener_filter_curvature.py
similarity index 96%
rename from nifty/library/wiener_filter/wiener_filter_curvature.py
rename to nifty/library/wiener_filter_curvature.py
index cf626754d1f2b813a1654f9af8a3fe2a0e5d3379..7632219b58eb8ef13cce7081a9f1d65977ee9fb1 100644
--- a/nifty/library/wiener_filter/wiener_filter_curvature.py
+++ b/nifty/library/wiener_filter_curvature.py
@@ -1,4 +1,4 @@
-from ...operators import EndomorphicOperator
+from ..operators import EndomorphicOperator
 
 
 class WienerFilterCurvature(EndomorphicOperator):
diff --git a/nifty/library/wiener_filter/wiener_filter_energy.py b/nifty/library/wiener_filter_energy.py
similarity index 90%
rename from nifty/library/wiener_filter/wiener_filter_energy.py
rename to nifty/library/wiener_filter_energy.py
index 3b456b225a3161b70bcf76dd46b0b557dfbfd4bf..5b77c1cd5b759e4b94333e367ce35395317e47d5 100644
--- a/nifty/library/wiener_filter/wiener_filter_energy.py
+++ b/nifty/library/wiener_filter_energy.py
@@ -1,7 +1,7 @@
-from ...minimization.energy import Energy
-from ...utilities import memo
-from ...operators.inversion_enabler import InversionEnabler
-from . import WienerFilterCurvature
+from ..minimization.energy import Energy
+from ..utilities import memo
+from ..operators.inversion_enabler import InversionEnabler
+from .wiener_filter_curvature import WienerFilterCurvature
 
 
 class WienerFilterEnergy(Energy):