17 files changed, 84 insertions, 75 deletions
diff --git a/README-win32-mingw-short.txt b/README-win32-mingw-short.txt
index 0e82a705d9..47c4f14b04 100644
--- a/README-win32-mingw-short.txt
+++ b/README-win32-mingw-short.txt
@@ -73,20 +73,23 @@ automake-1.8 --add-missing
 If you run this script it will convert a clean cvs checkout to a version which you can configure, build and install
 
 So now you can configure gnuradio.
-On win32 /mingw you need to give it a few parameters
-You need to tell it where cppunit is installed
-where boost include files are to be found
-where the pkg-config of libfftw is to be found
-to use a generic cpu (no 3Dnow,SSE,MMX) (This option will not be needed anymore soon)
-If you have boost installed in C:\boost_1_32_0 and cppunit and fftw in /usr/local then you would need the following configur commandline
-$ ./configure --with-md-cpu=generic --with-cppunit-prefix=/usr/local --with-boost-include-dir=/c/boost_1_32_0/include/boost-1_32 PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
-
-If everything went well you cannow do
-make
-make install
-
-Now you have a working gnuradio-core
-Now you can go on building and installing gr-audio-windows and windows and wxgui
-remember that all gnuradio and python dlls need to be on your path to use gnuradio
-The gnuradio dlls are installed at
+On win32 / mingw you need to give it a few parameters:
+ - You need to tell it where cppunit is installed
+ - where boost include files are to be found
+ - where the pkg-config of libfftw is to be found
+ - to use a generic cpu (no 3Dnow, SSE, MMX) (This option will not be needed anymore soon)
+ - If you have boost installed in C:\boost_1_32_0 and cppunit and fftw in /usr/local then you would need the following configure commandline:
+   $ ./configure --with-md-cpu=generic --with-cppunit-prefix=/usr/local --with-boost-include-dir=/c/boost_1_32_0/include/boost-1_32 PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
+
+If everything went well you can now do:
+   $ make
+   $ make install
+
+Now you have a working gnuradio-runtime.
+
+Now you can go on building and installing gr-audio-windows and windows and wxgui.
+
+Remember that all gnuradio and python dlls need to be on your path to use gnuradio.
+
+The gnuradio dlls are installed at:
 /c/Python24/Lib/site-packages:/c/Python24/Lib/site-packages/gnuradio:/c/Python24/Lib/site-packages/gnuradio/gr
diff --git a/README.hacking b/README.hacking
index 1f1083bb62..c22e00991d 100644
--- a/README.hacking
+++ b/README.hacking
@@ -153,17 +153,9 @@ off the bit rot we've been plagued with.
 For C++ we're using the cppunit framework.  cppunit has its bad
 smells, but it's mostly workable.  http://cppunit.sf.net
 
-Currently each directory <dirname> contains files qa_<dirname>.{h,cc}
+Currently each directory <dirname>/lib contains files qa_<dirname>.{h,cc}
 that bring together all the qa_<foo> test suites in the directory.
-We ought to be able to automate this without too much trouble.
 
-The directory gnuradio-core/src/tests contains programs that run
-the tests.  test_all runs all of the registered C++ unit tests.
-
-As far as I can tell, the cppunit TestFactoryRegistry maybe able to be
-tricked into doing what we want.  As is, I don't think it's enough by
-itself, since there's nothing dragging the qa* files out of the
-library and into the program.   I haven't tested out this idea.
 
 ** Python unit tests
 
diff --git a/cmake/Modules/GrMiscUtils.cmake b/cmake/Modules/GrMiscUtils.cmake
index 3803fba0b1..883ca5104f 100644
--- a/cmake/Modules/GrMiscUtils.cmake
+++ b/cmake/Modules/GrMiscUtils.cmake
@@ -268,15 +268,15 @@ function(GRCC)
   set(filenames ${ARGV})
   file(MAKE_DIRECTORY ${directory})
 
-  SET(GRCC_COMMAND ${CMAKE_SOURCE_DIR}/gr-utils/src/python/grcc)
+  SET(GRCC_COMMAND ${CMAKE_SOURCE_DIR}/gr-utils/python/grcc)
 
-  # GRCC uses some stuff in grc and gnuradio-core, so we force
+  # GRCC uses some stuff in grc and gnuradio-runtime, so we force
   # the known paths here
   list(APPEND PYTHONPATHS
     ${CMAKE_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/gnuradio-core/src/python
-    ${CMAKE_SOURCE_DIR}/gnuradio-core/src/lib/swig
-    ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
+    ${CMAKE_SOURCE_DIR}/gnuradio-runtime/python
+    ${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib/swig
+    ${CMAKE_BINARY_DIR}/gnuradio-runtime/lib/swig
     )
 
   if(WIN32)
diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in
index cad6a52efa..f87efd031d 100644
--- a/docs/doxygen/Doxyfile.in
+++ b/docs/doxygen/Doxyfile.in
@@ -735,7 +735,7 @@ INPUT_FILTER           =
 # info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
 # is applied to all files.
 
-FILTER_PATTERNS        = *.py=@top_srcdir@/gnuradio-core/doc/other/doxypy.py
+FILTER_PATTERNS        = *.py=@top_srcdir@/docs/doxygen/other/doxypy.py
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
 # INPUT_FILTER) will be used to filter the input files when producing source
diff --git a/docs/doxygen/README.doxyxml b/docs/doxygen/README.doxyxml
index fef71e106f..701c7ab8bc 100644
--- a/docs/doxygen/README.doxyxml
+++ b/docs/doxygen/README.doxyxml
@@ -11,7 +11,7 @@ Doxygen.
 
    $ python swig_doc.py \
      	    $(top_builddir)/docstrings/docs/doxygen/xml \
-     	    $(top_srcdir)/gnuradio-core/src/lib/swig/swig_doc.i
+     	    $(top_srcdir)/gnuradio-runtime/swig/swig_doc.i
 
    This uses the XML output of Doxygen to to rebuild a SWIG file that
    contains all of the current Doxygen markups.
diff --git a/docs/doxygen/other/logger.dox b/docs/doxygen/other/logger.dox
index 2b8919dc78..3eb487d9af 100644
--- a/docs/doxygen/other/logger.dox
+++ b/docs/doxygen/other/logger.dox
@@ -30,7 +30,7 @@ to disable a logger.
 
 \subsection configfile Logging Configuration
 
-The logging configuration can be found in the gnuradio-core.conf file
+The logging configuration can be found in the gnuradio-runtime.conf file
 under the [LOG] section. This allows us fairly complete control over
 the logging facilities. The main configuration functions are to set up
 the level of the loggers and set the default output behavior of the
diff --git a/docs/doxygen/other/main_page.dox b/docs/doxygen/other/main_page.dox
index 397f15b776..042a908051 100644
--- a/docs/doxygen/other/main_page.dox
+++ b/docs/doxygen/other/main_page.dox
@@ -413,9 +413,9 @@ config file itself.
 New as of 3.6.5.
 
 Using gr_modtool, each package comes with the ability to easily locate
-the gnuradio-core library using the 'find_package(GnuradioCore)' cmake
-command. This only locates that the library and include directories
-exist, which is enough for most simple projects.
+the gnuradio-runtime library using the 'find_package(GnuradioRuntime)'
+cmake command. This only locates that the library and include
+directories exist, which is enough for most simple projects.
 
 As projects become more complicated and start needing to rely on other
 GNU Radio components like gnuradio-blocks or gnuradio-filter, for
diff --git a/docs/doxygen/other/msg_passing.dox b/docs/doxygen/other/msg_passing.dox
index 7035f291e4..dc0d5bbb3f 100644
--- a/docs/doxygen/other/msg_passing.dox
+++ b/docs/doxygen/other/msg_passing.dox
@@ -264,6 +264,6 @@ All of these mechanisms are explored and tested in the QA code of the
 file qa_pdu.py.
 
 There are some examples of using the message passing infrastructure
-through GRC in gnuradio-core/src/examples/msg_passing.
+through GRC in gr-blocks/examples/msg_passing.
 
 */
diff --git a/gnuradio-runtime/include/gnuradio/realtime_impl.h b/gnuradio-runtime/include/gnuradio/realtime_impl.h
index 82845918ee..264fae7b27 100644
--- a/gnuradio-runtime/include/gnuradio/realtime_impl.h
+++ b/gnuradio-runtime/include/gnuradio/realtime_impl.h
@@ -87,7 +87,7 @@ namespace gr {
      */
 
     // NOTE: If you change this, you need to change the code in
-    // gnuradio-core/src/lib/runtime/gr_realtime.i, see note there.
+    // gnuradio-runtime/swig/realtime.i, see note there.
     rt_status_t
     GR_RUNTIME_API enable_realtime_scheduling(rt_sched_param = rt_sched_param());
 
diff --git a/gnuradio-runtime/lib/posix_memalign.cc b/gnuradio-runtime/lib/posix_memalign.cc
index a08e9e127a..f75b1d5f3f 100644
--- a/gnuradio-runtime/lib/posix_memalign.cc
+++ b/gnuradio-runtime/lib/posix_memalign.cc
@@ -98,7 +98,7 @@ int posix_memalign
    * (enough for the input arguments); no idea what to do.
    */
 
-#error gnuradio-core/src/libmissing/posix_memalign.cc: Cannot find a way to alloc aligned memory.
+#error gnuradio-runtime/lib/posix_memalign.cc: Cannot find a way to alloc aligned memory.
 
 #endif
 
diff --git a/gnuradio-runtime/python/gnuradio/gr/prefs.py b/gnuradio-runtime/python/gnuradio/gr/prefs.py
index abba6b57a6..17f5bfb54c 100644
--- a/gnuradio-runtime/python/gnuradio/gr/prefs.py
+++ b/gnuradio-runtime/python/gnuradio/gr/prefs.py
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-import gnuradio_core as gsp
+import gnuradio_runtime as gsp
 _prefs_base = gsp.prefs
 
 
diff --git a/gnuradio-runtime/swig/msg_queue.i b/gnuradio-runtime/swig/msg_queue.i
index 59dff158ce..a788ab6f8b 100644
--- a/gnuradio-runtime/swig/msg_queue.i
+++ b/gnuradio-runtime/swig/msg_queue.i
@@ -74,7 +74,7 @@ namespace gr {
 /*
  * The following kludge-o-rama releases the Python global interpreter
  * lock around these potentially blocking calls.  We don't want
- * libgnuradio-core to be dependent on Python, thus we create these
+ * libgnuradio-runtime to be dependent on Python, thus we create these
  * functions that serve as replacements for the normal C++ delete_head
  * and insert_tail methods.  The %pythoncode smashes these new C++
  * functions into the gr.msg_queue wrapper class, so that everything
diff --git a/gr-audio/README b/gr-audio/README
deleted file mode 100644
index ae929a94a6..0000000000
--- a/gr-audio/README
+++ /dev/null
@@ -1,11 +0,0 @@
-The gnuradio audio component provides an audio_source and audio_sink block.
-The audio blocks stream floating point samples to and from audio hardware.
-
-The gr-audio will be built automatically when gnuradio-core is enabled.
-Support for underlying audio architectures depends on OS and installed libraries.
-At the time of writing, gr-audio supports oss, alsa, jack, portaudio, audiounit, and winmm.
-
-At runtime, gr-audio will automatically select from the available architectures.
-The user can override the selection via configuration file by setting "audio_module"
-to one of the following strings: oss, alsa, jack, portaudio, osx, or windows.
-See gr-audio.conf for an example.
diff --git a/gr-audio/doc/README.audio b/gr-audio/doc/README.audio
index 754c849c8b..b6fc2ac59c 100644
--- a/gr-audio/doc/README.audio
+++ b/gr-audio/doc/README.audio
@@ -1,14 +1,26 @@
-This is the gr-audio package. This package includes all of the
-supported audio interfaces, including:
-    - alsa
-    - oss
-    - jack
-    - portaudio
-    - osx
-    - windows
-
-Typically, the audio package will auto-detect the proper driver to use
-based on the system it is run on. Import this package with:
+The gnuradio audio component provides gr::audio::source and
+gr::audio::sink blocks. The audio blocks stream floating point samples
+to and from audio hardware.
+
+The gr-audio component will be built automatically when
+gnuradio-runtime is enabled. Support for underlying audio
+architectures depends on OS and installed libraries. At the time of
+writing, gr-audio supports OSS, ALSA, Jack, Portaudio, Audiounit, and
+Winmm.
+
+At runtime, gr-audio will automatically select from the available
+architectures. The user can override the selection via configuration
+file by setting "audio_module" to one of the following strings:
+ - oss
+ - alsa
+ - jack
+ - portaudio
+ - osx
+ - windows
+
+See gr-audio.conf for an example.
+
+Import this package with:
 
     from gnuradio import audio
 
diff --git a/gr-audio/doc/audio.dox b/gr-audio/doc/audio.dox
index 3a0cb5e488..fd88b9e563 100644
--- a/gr-audio/doc/audio.dox
+++ b/gr-audio/doc/audio.dox
@@ -2,28 +2,41 @@
 
 \section Introduction
 
-This is the gr-audio package. This package includes all of the
-supported audio interfaces, including:
+The gnuradio audio component provides gr::audio::source and
+gr::audio::sink blocks. The audio blocks stream floating point samples
+to and from audio hardware.
+
+The gr-audio component will be built automatically when
+gnuradio-runtime is enabled. Support for underlying audio
+architectures depends on OS and installed libraries. At the time of
+writing, gr-audio supports OSS, ALSA, Jack, Portaudio, Audiounit, and
+Winmm.
+
+At runtime, gr-audio will automatically select from the available
+architectures. The user can override the selection via configuration
+file by setting "audio_module" to one of the following strings:
 
-\li alsa
 \li oss
+\li alsa
 \li jack
 \li portaudio
 \li osx
 \li windows
 
+See gr-audio.conf for an example.
+
+Import this package with:
+
 \code
     from gnuradio import audio
 \endcode
 
 See the Doxygen documentation for details about the blocks available
-in this package. The relevant blocks are listed in the \ref audio_blk group.
-
-A quick listing of the details can be found in Python after importing
-by using:
+in this package. A quick listing of the details can be found in Python
+after importing by using:
 
 \code
-    help(digital)
+    help(audio)
 \endcode
 
 
diff --git a/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_cc.h b/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_cc.h
index 7710ca7fa2..f24e7d9c54 100644
--- a/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_cc.h
+++ b/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_cc.h
@@ -44,8 +44,8 @@ namespace gr {
      * quantized in the interpolate method to 32nd's of a sample.
      *
      * For more information, in the GNU Radio source code, see:
-     * \li gnuradio-core/src/gen_interpolator_taps/README
-     * \li gnuradio-core/src/gen_interpolator_taps/praxis.txt
+     * \li gr-filter/lib/gen_interpolator_taps/README
+     * \li gr-filter/lib/gen_interpolator_taps/praxis.txt
      */
     class FILTER_API mmse_fir_interpolator_cc
     {
diff --git a/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_ff.h b/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_ff.h
index a7c6d7d973..069a9fc09c 100644
--- a/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_ff.h
+++ b/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_ff.h
@@ -44,8 +44,8 @@ namespace gr {
      * quantized in the interpolate method to 32nd's of a sample.
      *
      * For more information, in the GNU Radio source code, see:
-     * \li gnuradio-core/src/gen_interpolator_taps/README
-     * \li gnuradio-core/src/gen_interpolator_taps/praxis.txt
+     * \li gr-filter/lib/gen_interpolator_taps/README
+     * \li gr-filter/lib/gen_interpolator_taps/praxis.txt
      */
     class FILTER_API mmse_fir_interpolator_ff
     {