diff --git a/nifty/__init__.py b/nifty/__init__.py
index fb9012cf37b42dd51545ac636016927f445eb76d..ba4b8333385fb6ba42e7a1fd334a3ac1cea6eb54 100644
--- a/nifty/__init__.py
+++ b/nifty/__init__.py
@@ -54,6 +54,8 @@ from operators import *
 
 from probing import *
 
+from library import *
+
 from sugar import *
 
 import plotting
diff --git a/nifty/energies/__init__.py b/nifty/energies/__init__.py
index 0ebaa4403e6b3cce66435f50dfdf580b94f25ea7..6353111fe39996f34bc9b3af9cc87cef29b3a2d3 100644
--- a/nifty/energies/__init__.py
+++ b/nifty/energies/__init__.py
@@ -19,4 +19,3 @@
 from energy import Energy
 from line_energy import LineEnergy
 from memoization import memo
-from wiener_filter_energy import WienerFilterEnergy
diff --git a/nifty/library/__init__.py b/nifty/library/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e051f112f2e8d8e470b6d841172f3dac00d2c4c3
--- /dev/null
+++ b/nifty/library/__init__.py
@@ -0,0 +1,2 @@
+from operator_library import *
+from energy_library import *
diff --git a/nifty/library/energy_library/__init__.py b/nifty/library/energy_library/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..14b2bf9ed2044e9c99da72af0fccdb1089f165e4
--- /dev/null
+++ b/nifty/library/energy_library/__init__.py
@@ -0,0 +1 @@
+from wiener_filter_energy import WienerFilterEnergy
\ No newline at end of file
diff --git a/nifty/energies/wiener_filter_energy.py b/nifty/library/energy_library/wiener_filter_energy.py
similarity index 93%
rename from nifty/energies/wiener_filter_energy.py
rename to nifty/library/energy_library/wiener_filter_energy.py
index ed2d0d57dc168866bea65923d8dd78056b727080..a4d66a976a7ed795de6827b20b1d438e99fcd80b 100644
--- a/nifty/energies/wiener_filter_energy.py
+++ b/nifty/library/energy_library/wiener_filter_energy.py
@@ -1,5 +1,5 @@
-from .energy import Energy
-from nifty.operators import WienerFilterCurvature
+from nifty.energies.energy import Energy
+from nifty.library.operator_library import WienerFilterCurvature
 
 class WienerFilterEnergy(Energy):
     """The Energy for the Wiener filter.
diff --git a/nifty/library/operator_library/__init__.py b/nifty/library/operator_library/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..002face2b7d298be081daa5808b5ad32aba8b7e3
--- /dev/null
+++ b/nifty/library/operator_library/__init__.py
@@ -0,0 +1 @@
+from wiener_filter_curvature import WienerFilterCurvature
\ No newline at end of file
diff --git a/nifty/operators/curvature_operators/wiener_filter_curvature.py b/nifty/library/operator_library/wiener_filter_curvature.py
similarity index 100%
rename from nifty/operators/curvature_operators/wiener_filter_curvature.py
rename to nifty/library/operator_library/wiener_filter_curvature.py
diff --git a/nifty/operators/__init__.py b/nifty/operators/__init__.py
index b64ee506ada2e52aa5c5397b4e0cc5f23f3c7f13..1a8940dc1dd33b1193e00fa0341add77202e6e38 100644
--- a/nifty/operators/__init__.py
+++ b/nifty/operators/__init__.py
@@ -39,5 +39,3 @@ from propagator_operator import HarmonicPropagatorOperator
 from composed_operator import ComposedOperator
 
 from response_operator import ResponseOperator
-
-from curvature_operators import WienerFilterCurvature
diff --git a/nifty/operators/curvature_operators/__init__.py b/nifty/operators/curvature_operators/__init__.py
deleted file mode 100644
index 3af162be136ce5853aac3de2c0f714d1b6ae9e8c..0000000000000000000000000000000000000000
--- a/nifty/operators/curvature_operators/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from wiener_filter_curvature import WienerFilterCurvature