diff --git a/source/modules/rtosc/Makefile b/source/modules/rtosc/Makefile
deleted file mode 100644
index bb2417541..000000000
--- a/source/modules/rtosc/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/make -f
-# Makefile for rtosc #
-# ------------------ #
-# Created by falkTX
-#
-
-CWD=../..
-MODULENAME=rtosc
-include ../Makefile.mk
-
-# ----------------------------------------------------------------------------------------------------------------------------
-
-BUILD_CXX_FLAGS += -I.
-
-# ----------------------------------------------------------------------------------------------------------------------------
-
-OBJS = \
-	$(OBJDIR)/dispatch.c.o \
-	$(OBJDIR)/rtosc.c.o \
-	$(OBJDIR)/midimapper.cpp.o \
-	$(OBJDIR)/miditable.cpp.o \
-	$(OBJDIR)/ports.cpp.o \
-	$(OBJDIR)/subtree-serialize.cpp.o \
-	$(OBJDIR)/thread-link.cpp.o \
-	$(OBJDIR)/undo-history.cpp.o
-
-# ----------------------------------------------------------------------------------------------------------------------------
-
-all: $(MODULEDIR)/$(MODULENAME).a
-
-# ----------------------------------------------------------------------------------------------------------------------------
-
-clean:
-	rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
-
-debug:
-	$(MAKE) DEBUG=true
-
-# ----------------------------------------------------------------------------------------------------------------------------
-
-$(MODULEDIR)/$(MODULENAME).a: $(OBJS)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).a"
-	@rm -f $@
-	@$(AR) crs $@ $^
-
-# ----------------------------------------------------------------------------------------------------------------------------
-
-$(OBJDIR)/%.c.o: src/%.c
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $<"
-	@$(CC) $< $(BUILD_C_FLAGS) -c -o $@
-
-$(OBJDIR)/%.cpp.o: src/cpp/%.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $<"
-	@$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
-
--include $(OBJS:%.o=%.d)
-
-# ----------------------------------------------------------------------------------------------------------------------------
diff --git a/source/modules/rtosc/src/cpp/midimapper.cpp b/source/native-plugins/zynaddsubfx/rtosc/cpp/midimapper.cpp
similarity index 100%
rename from source/modules/rtosc/src/cpp/midimapper.cpp
rename to source/native-plugins/zynaddsubfx/rtosc/cpp/midimapper.cpp
diff --git a/source/modules/rtosc/src/cpp/miditable.cpp b/source/native-plugins/zynaddsubfx/rtosc/cpp/miditable.cpp
similarity index 100%
rename from source/modules/rtosc/src/cpp/miditable.cpp
rename to source/native-plugins/zynaddsubfx/rtosc/cpp/miditable.cpp
diff --git a/source/modules/rtosc/src/cpp/ports.cpp b/source/native-plugins/zynaddsubfx/rtosc/cpp/ports.cpp
similarity index 100%
rename from source/modules/rtosc/src/cpp/ports.cpp
rename to source/native-plugins/zynaddsubfx/rtosc/cpp/ports.cpp
diff --git a/source/modules/rtosc/src/cpp/subtree-serialize.cpp b/source/native-plugins/zynaddsubfx/rtosc/cpp/subtree-serialize.cpp
similarity index 100%
rename from source/modules/rtosc/src/cpp/subtree-serialize.cpp
rename to source/native-plugins/zynaddsubfx/rtosc/cpp/subtree-serialize.cpp
diff --git a/source/modules/rtosc/src/cpp/thread-link.cpp b/source/native-plugins/zynaddsubfx/rtosc/cpp/thread-link.cpp
similarity index 100%
rename from source/modules/rtosc/src/cpp/thread-link.cpp
rename to source/native-plugins/zynaddsubfx/rtosc/cpp/thread-link.cpp
diff --git a/source/modules/rtosc/src/cpp/undo-history.cpp b/source/native-plugins/zynaddsubfx/rtosc/cpp/undo-history.cpp
similarity index 100%
rename from source/modules/rtosc/src/cpp/undo-history.cpp
rename to source/native-plugins/zynaddsubfx/rtosc/cpp/undo-history.cpp
diff --git a/source/modules/rtosc/src/dispatch.c b/source/native-plugins/zynaddsubfx/rtosc/dispatch.c
similarity index 100%
rename from source/modules/rtosc/src/dispatch.c
rename to source/native-plugins/zynaddsubfx/rtosc/dispatch.c
diff --git a/source/modules/rtosc/miditable.h b/source/native-plugins/zynaddsubfx/rtosc/miditable.h
similarity index 100%
rename from source/modules/rtosc/miditable.h
rename to source/native-plugins/zynaddsubfx/rtosc/miditable.h
diff --git a/source/modules/rtosc/port-sugar.h b/source/native-plugins/zynaddsubfx/rtosc/port-sugar.h
similarity index 100%
rename from source/modules/rtosc/port-sugar.h
rename to source/native-plugins/zynaddsubfx/rtosc/port-sugar.h
diff --git a/source/modules/rtosc/ports.h b/source/native-plugins/zynaddsubfx/rtosc/ports.h
similarity index 100%
rename from source/modules/rtosc/ports.h
rename to source/native-plugins/zynaddsubfx/rtosc/ports.h
diff --git a/source/modules/rtosc/src/rtosc.c b/source/native-plugins/zynaddsubfx/rtosc/rtosc.c
similarity index 100%
rename from source/modules/rtosc/src/rtosc.c
rename to source/native-plugins/zynaddsubfx/rtosc/rtosc.c
diff --git a/source/modules/rtosc/rtosc.h b/source/native-plugins/zynaddsubfx/rtosc/rtosc.h
similarity index 100%
rename from source/modules/rtosc/rtosc.h
rename to source/native-plugins/zynaddsubfx/rtosc/rtosc.h
diff --git a/source/modules/rtosc/subtree-serialize.h b/source/native-plugins/zynaddsubfx/rtosc/subtree-serialize.h
similarity index 100%
rename from source/modules/rtosc/subtree-serialize.h
rename to source/native-plugins/zynaddsubfx/rtosc/subtree-serialize.h
diff --git a/source/modules/rtosc/thread-link.h b/source/native-plugins/zynaddsubfx/rtosc/thread-link.h
similarity index 100%
rename from source/modules/rtosc/thread-link.h
rename to source/native-plugins/zynaddsubfx/rtosc/thread-link.h
diff --git a/source/modules/rtosc/typed-message.h b/source/native-plugins/zynaddsubfx/rtosc/typed-message.h
similarity index 100%
rename from source/modules/rtosc/typed-message.h
rename to source/native-plugins/zynaddsubfx/rtosc/typed-message.h
diff --git a/source/modules/rtosc/undo-history.h b/source/native-plugins/zynaddsubfx/rtosc/undo-history.h
similarity index 100%
rename from source/modules/rtosc/undo-history.h
rename to source/native-plugins/zynaddsubfx/rtosc/undo-history.h