diff --git a/src/FluidBufNoveltySlice/CMakeLists.txt b/src/FluidBufNoveltySlice/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp b/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp
index 443f28b..52a4054 100644
--- a/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp
+++ b/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp
@@ -1,15 +1,14 @@
-  // FD_BufNMF, an NRT buffer NMF Processor
-// A tool from the FluCoMa project, funded by the European Research Council (ERC) under the European Union’s Horizon 2020 research and innovation programme (grant agreement No 725899)
 
+// A tool from the FluCoMa project, funded by the European Research Council (ERC) under the European Union’s Horizon 2020 research and innovation programme (grant agreement No 725899)
 
-#include <clients/nrt/NoveltyClient.hpp>
+#include <clients/rt/NoveltySlice.hpp>
+#include <clients/nrt/FluidNRTClientWrapper.hpp>
 #include <FluidSCWrapper.hpp>
 
-static InterfaceTable* ft; 
+static InterfaceTable *ft;
 
-PluginLoad(OfflineFluidDecompositionUGens)
-{
+PluginLoad(OfflineFluidDecompositionUGens) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NoveltyClient>("BufNoveltySlice", ft);
+  makeSCWrapper<NRTNoveltySlice>("BufNoveltySlice", ft);
 }
diff --git a/src/FluidBufNoveltySlice/tests.scd b/src/FluidBufNoveltySlice/tests.scd
deleted file mode 100644
index 28e7936..0000000
--- a/src/FluidBufNoveltySlice/tests.scd
+++ /dev/null
@@ -1,72 +0,0 @@
-s.reboot
-////////////////////////////
-// test for efficiency
-
-(
-b = Buffer.read(s,"../../release-packaging/AudioFiles/Tremblay-AaS-AcousticStrums-M.wav".resolveRelative);
-c = Buffer.new(s);
-)
-
-(
-// with basic params
-Routine{
-	t = Main.elapsedTime;
-	FluidBufNoveltySlice.process(s,b.bufnum, transBufNum: c.bufnum, thresh:0.6);
-	s.sync;
-	(Main.elapsedTime - t).postln;
-}.play
-);
-
-//check the number of slices
-c.query;
-c.getn(0,34,{|x|x.postln})
-
-//loops over a splice
-(
-{
-	BufRd.ar(
-		1,
-		b.bufnum,
-		Phasor.ar(
-			0,
-			1,
-			BufRd.kr(
-				1,
-				c.bufnum,
-				MouseX.kr(
-					0,
-					BufFrames.kr(c.bufnum) - 1),
-				0,
-				1),
-			BufRd.kr(
-				1,
-				c.bufnum,
-				MouseX.kr(
-					1,
-					BufFrames.kr(c.bufnum)),
-				0,
-				1),
-			BufRd.kr(
-				1,
-				c.bufnum,
-				MouseX.kr(
-					0,
-					BufFrames.kr(c.bufnum) - 1),
-				0,
-				1)),
-		0,
-		1)
-}.play;
-)
-
-
-// with everything changed to make it much faster
-(
-Routine{
-	t = Main.elapsedTime;
-	FluidBufNoveltySlice.process(s,b.bufnum, 44100, 44100, 0, 0, c.bufnum, d.bufnum, 100, 512,256,1,2,1,12,20);//needs something else
-	s.sync;
-	(Main.elapsedTime - t).postln;
-}.play
-);
-
diff --git a/src/FluidBufRTNoveltySlice/FluidBufRTNoveltySlice.cpp b/src/FluidBufRTNoveltySlice/FluidBufRTNoveltySlice.cpp
deleted file mode 100644
index c637663..0000000
--- a/src/FluidBufRTNoveltySlice/FluidBufRTNoveltySlice.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-// A tool from the FluCoMa project, funded by the European Research Council (ERC) under the European Union’s Horizon 2020 research and innovation programme (grant agreement No 725899)
-
-#include <clients/rt/RTNoveltySlice.hpp>
-#include <clients/nrt/FluidNRTClientWrapper.hpp>
-#include <FluidSCWrapper.hpp>
-
-static InterfaceTable *ft;
-
-PluginLoad(OfflineFluidDecompositionUGens) {
-  ft = inTable;
-  using namespace fluid::client;
-  makeSCWrapper<NRTRTNoveltySlice>("BufRTNoveltySlice", ft);
-}
diff --git a/src/FluidBufRTNoveltySlice/CMakeLists.txt b/src/FluidNoveltySlice/CMakeLists.txt
similarity index 100%
rename from src/FluidBufRTNoveltySlice/CMakeLists.txt
rename to src/FluidNoveltySlice/CMakeLists.txt
diff --git a/src/FluidRTNoveltySlice/FluidRTNoveltySlice.cpp b/src/FluidNoveltySlice/FluidNoveltySlice.cpp
similarity index 76%
rename from src/FluidRTNoveltySlice/FluidRTNoveltySlice.cpp
rename to src/FluidNoveltySlice/FluidNoveltySlice.cpp
index 8e23423..b2f5103 100644
--- a/src/FluidRTNoveltySlice/FluidRTNoveltySlice.cpp
+++ b/src/FluidNoveltySlice/FluidNoveltySlice.cpp
@@ -1,7 +1,7 @@
 
 // A tool from the FluCoMa project, funded by the European Research Council (ERC) under the European Union’s Horizon 2020 research and innovation programme (grant agreement No 725899)
 
-#include <clients/rt/RTNoveltySlice.hpp>
+#include <clients/rt/NoveltySlice.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<RTNoveltySlice>("FluidRTNoveltySlice", ft);
+  makeSCWrapper<NoveltySlice>("FluidNoveltySlice", ft);
 }
diff --git a/src/FluidRTNoveltySlice/CMakeLists.txt b/src/FluidRTNoveltySlice/CMakeLists.txt
deleted file mode 100644
index 3693881..0000000
--- a/src/FluidRTNoveltySlice/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-cmake_minimum_required(VERSION 3.3)
-get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE)
-message("Configuring ${PLUGIN}")
-set(FILENAME ${PLUGIN}.cpp)
-
-add_library(
-  ${PLUGIN}
-  MODULE
-  ${FILENAME}
-)
-
-target_include_directories(
-  ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include
-)
-
-target_link_libraries(
-  ${PLUGIN} PRIVATE FLUID_DECOMPOSITION
-)
-
-include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake)