diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5fc7d6e..a33ec73 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,9 @@
 add_library(solanaceae_message3
-	./solanaceae/message3/file.hpp
-	./solanaceae/message3/file_r_mem.hpp
-	./solanaceae/message3/file_r_file.hpp
-	./solanaceae/message3/file_w_file.hpp
-	./solanaceae/message3/file_rw_file.hpp
+	#./solanaceae/message3/file.hpp
+	#./solanaceae/message3/file_r_mem.hpp
+	#./solanaceae/message3/file_r_file.hpp
+	#./solanaceae/message3/file_w_file.hpp
+	#./solanaceae/message3/file_rw_file.hpp
 
 	./solanaceae/message3/message.hpp
 	./solanaceae/message3/components.hpp
diff --git a/src/solanaceae/message3/components.hpp b/src/solanaceae/message3/components.hpp
index b7beaf8..394016e 100644
--- a/src/solanaceae/message3/components.hpp
+++ b/src/solanaceae/message3/components.hpp
@@ -5,7 +5,7 @@
 #include "./message.hpp"
 
 //fwd
-struct FileI;
+struct File2I;
 
 #include <entt/container/dense_map.hpp>
 
@@ -93,7 +93,7 @@ namespace Message::Components {
 		};
 
 		// TODO: rename to stream?
-		using File = std::unique_ptr<FileI>;
+		using File = std::unique_ptr<File2I>;
 
 		struct TagReceiving {};
 		struct TagSending {};
diff --git a/src/solanaceae/message3/file.hpp b/src/solanaceae/message3/old/file.hpp
similarity index 100%
rename from src/solanaceae/message3/file.hpp
rename to src/solanaceae/message3/old/file.hpp
diff --git a/src/solanaceae/message3/file_r_file.hpp b/src/solanaceae/message3/old/file_r_file.hpp
similarity index 100%
rename from src/solanaceae/message3/file_r_file.hpp
rename to src/solanaceae/message3/old/file_r_file.hpp
diff --git a/src/solanaceae/message3/file_r_mem.hpp b/src/solanaceae/message3/old/file_r_mem.hpp
similarity index 100%
rename from src/solanaceae/message3/file_r_mem.hpp
rename to src/solanaceae/message3/old/file_r_mem.hpp
diff --git a/src/solanaceae/message3/file_rw_file.hpp b/src/solanaceae/message3/old/file_rw_file.hpp
similarity index 100%
rename from src/solanaceae/message3/file_rw_file.hpp
rename to src/solanaceae/message3/old/file_rw_file.hpp
diff --git a/src/solanaceae/message3/file_w_file.hpp b/src/solanaceae/message3/old/file_w_file.hpp
similarity index 100%
rename from src/solanaceae/message3/file_w_file.hpp
rename to src/solanaceae/message3/old/file_w_file.hpp