8 files changed, 10 insertions, 5 deletions
diff --git a/gnuradio-core/src/python/gnuradio/__init__.py b/gnuradio-core/src/python/gnuradio/__init__.py
index 0bc9f4a253..48e65a09ed 100644
--- a/gnuradio-core/src/python/gnuradio/__init__.py
+++ b/gnuradio-core/src/python/gnuradio/__init__.py
@@ -21,7 +21,6 @@ if path.endswith('.pyc'):
     path = path[:-1]
 
 if path.endswith(path_ending):
-    print("importing from build directory")
     # We importing it from build directory.
     build_path = os.path.join(path[:-len(path_ending)])
 
@@ -31,5 +30,4 @@ if path.endswith(path_ending):
     __path__.append(os.path.join(build_path, 'gr-blocks', 'python'))
     __path__.append(os.path.join(build_path, 'gr-digital', 'python'))
     __path__.append(os.path.join(build_path, 'gr-filter', 'python'))
-    
-print(__path__)
+    __path__.append(os.path.join(build_path, 'gr-fft', 'python'))
diff --git a/gr-fft/CMakeLists.txt b/gr-fft/CMakeLists.txt
index 6b37bd3caa..aad510ff72 100644
--- a/gr-fft/CMakeLists.txt
+++ b/gr-fft/CMakeLists.txt
@@ -89,7 +89,7 @@ add_subdirectory(include/fft)
 add_subdirectory(lib)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
-    add_subdirectory(python)
+    add_subdirectory(python/fft)
     add_subdirectory(grc)
 endif(ENABLE_PYTHON)
 #add_subdirectory(examples)
diff --git a/gr-fft/python/CMakeLists.txt b/gr-fft/python/fft/CMakeLists.txt
index 415d87e2e8..415d87e2e8 100644
--- a/gr-fft/python/CMakeLists.txt
+++ b/gr-fft/python/fft/CMakeLists.txt
diff --git a/gr-fft/python/__init__.py b/gr-fft/python/fft/__init__.py
index 093cc3c696..acb70a2947 100644
--- a/gr-fft/python/__init__.py
+++ b/gr-fft/python/fft/__init__.py
@@ -23,6 +23,13 @@
 This is the gr-fft package. This package provides GNU Radio
 processing blocks for FFT and related functions.
 '''
+import os
+
+try:
+    from fft_swig import *
+except ImportError:
+    dirname, filename = os.path.split(os.path.abspath(__file__))
+    __path__.append(os.path.join(dirname, "..", "..", "swig"))
+    from fft_swig import *
 
-from fft_swig import *
 from window import *
diff --git a/gr-fft/python/logpwrfft.py b/gr-fft/python/fft/logpwrfft.py
index 98303b1e1e..98303b1e1e 100644
--- a/gr-fft/python/logpwrfft.py
+++ b/gr-fft/python/fft/logpwrfft.py
diff --git a/gr-fft/python/qa_fft.py b/gr-fft/python/fft/qa_fft.py
index 0a66a2c1fc..0a66a2c1fc 100755
--- a/gr-fft/python/qa_fft.py
+++ b/gr-fft/python/fft/qa_fft.py
diff --git a/gr-fft/python/qa_goertzel.py b/gr-fft/python/fft/qa_goertzel.py
index 27f9d370e1..27f9d370e1 100755
--- a/gr-fft/python/qa_goertzel.py
+++ b/gr-fft/python/fft/qa_goertzel.py
diff --git a/gr-fft/python/window.py b/gr-fft/python/fft/window.py
index 0065a08a61..0065a08a61 100644
--- a/gr-fft/python/window.py
+++ b/gr-fft/python/fft/window.py