diff --git a/fdNRTBase/CMakeLists.txt b/fdNRTBase/CMakeLists.txt
deleted file mode 100755
index be9c700..0000000
--- a/fdNRTBase/CMakeLists.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-####### added the eingenmf
-set(FLUID_DECOMP_DIR ../../fluid_decomposition)
-
-include_directories(
-	"${FLUID_DECOMP_DIR}"
-	"${FLUID_DECOMP_DIR}/include"
-  "${FLUID_DECOMP_DIR}/3rdparty"
-)
-
-####### original SC Cmake file starts here
-set(FILENAME "fdNRTBase.cpp") #specify the .cpp file here
-cmake_minimum_required (VERSION 2.8)
-get_filename_component(PROJECT ${FILENAME} NAME_WE) #automatically sets project name from the filename
-message(STATUS "Project name is ${PROJECT}")
-project (${PROJECT})
-
-include_directories(${SC_PATH}/include/plugin_interface)
-include_directories(${SC_PATH}/include/common)
-include_directories(${SC_PATH}/common)
-
-set(CMAKE_SHARED_MODULE_PREFIX "")
-if(APPLE OR WIN32)
-set(CMAKE_SHARED_MODULE_SUFFIX ".scx")
-endif()
-
-option(SUPERNOVA "Build plugins for supernova" OFF)
-if (SUPERNOVA)
-    include_directories(${SC_PATH}/external_libraries/nova-tt)
-    # actually just boost.atomic
-    include_directories(${SC_PATH}/external_libraries/boost)
-    include_directories(${SC_PATH}/external_libraries/boost_lockfree)
-    include_directories(${SC_PATH}/external_libraries/boost-lockfree)
-endif()
-
-option(CPP11 "Build with c++11." ON)
-
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-	set(CMAKE_COMPILER_IS_CLANG 1)
-endif()
-
-if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
-    add_definitions(-fvisibility=hidden)
-
-    include (CheckCCompilerFlag)
-    include (CheckCXXCompilerFlag)
-
-    CHECK_C_COMPILER_FLAG(-msse HAS_SSE)
-    CHECK_CXX_COMPILER_FLAG(-msse HAS_CXX_SSE)
-
-    if (HAS_SSE)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse")
-    endif()
-    if (HAS_CXX_SSE)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
-    endif()
-
-    CHECK_C_COMPILER_FLAG(-msse2 HAS_SSE2)
-    CHECK_CXX_COMPILER_FLAG(-msse2 HAS_CXX_SSE2)
-
-    if (HAS_SSE2)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2")
-    endif()
-    if (HAS_CXX_SSE2)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")
-    endif()
-
-    CHECK_C_COMPILER_FLAG(-mfpmath=sse HAS_FPMATH_SSE)
-    CHECK_CXX_COMPILER_FLAG(-mfpmath=sse HAS_CXX_FPMATH_SSE)
-
-    if (HAS_FPMATH_SSE)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse")
-    endif()
-    if (HAS_CXX_FPMATH_SSE)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse")
-    endif()
-
-    if(NATIVE)
-        add_definitions(-march=native)
-    endif()
-
-    if(CPP11)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-        if(CMAKE_COMPILER_IS_CLANG)
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-        endif()
-    endif()
-endif()
-if(MINGW)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mstackrealign")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mstackrealign")
-endif()
-
-####### added the fluid_decomposition
-add_library(
-${PROJECT}
-MODULE
-${FILENAME}
-"${FLUID_DECOMP_DIR}/3rdparty/HISSTools_FFT/HISSTools_FFT.cpp"
-)
-if(SUPERNOVA)
-    add_library(${PROJECT}_supernova MODULE ${FILENAME})
-    set_property(TARGET ${PROJECT}_supernova
-                 PROPERTY COMPILE_DEFINITIONS SUPERNOVA)
-endif()
-
-add_custom_command(
-  TARGET
-	${PROJECT}
-	POST_BUILD
-	COMMAND ${CMAKE_COMMAND} -E make_directory "../../release-packaging/${PROJECT}/plugins"
-	COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${PROJECT}> "../../release-packaging/${PROJECT}/plugins"
-)
-
-target_link_libraries (${PROJECT} "-framework Accelerate")
diff --git a/fdNRTBase/tests.scd b/fdNRTBase/tests.scd
deleted file mode 100644
index e6f5ab6..0000000
--- a/fdNRTBase/tests.scd
+++ /dev/null
@@ -1,25 +0,0 @@
-s.reboot
-
-//Quickie test of buffer allocation working
-//Read a sound file
-a = Buffer.read(s,"/Users/owen/Desktop/denoise_stn/sources/01-mix.wav");
-//Pass buffer to this, along with a rank. It will allocate a new buffer,
-//size it appropriately (in our server code) and return the new object
-f = FDBufferExperiments.allocMatch(s,a,rank:5);
-//Make sure everything is kosher:
-a.query
-f.query
-
-
-//Try full async version
-s.reboot
-
-//Quickie test of buffer allocation working
-//Read a sound file
-a = Buffer.read(s,"/Users/owen/Desktop/denoise_stn/sources/01-mix.wav");
-//Pass buffer to this, along with a rank. It will allocate a new buffer,
-//size it appropriately (in our server code) and return the new object
-f = FDBufferExperiments.allocMatchAsync(s,a,rank:5);
-//Make sure everything is kosher:
-a.query
-f.query
\ No newline at end of file
diff --git a/fdNRTBase/fdNRTBase.cpp b/include/fdNRTBase.hpp
similarity index 100%
rename from fdNRTBase/fdNRTBase.cpp
rename to include/fdNRTBase.hpp