diff --git a/src/jvmMain/kotlin/nl/astraeus/vst/base/db/SampleDao.kt b/src/jvmMain/kotlin/nl/astraeus/vst/base/db/BinaryDao.kt
similarity index 89%
rename from src/jvmMain/kotlin/nl/astraeus/vst/base/db/SampleDao.kt
rename to src/jvmMain/kotlin/nl/astraeus/vst/base/db/BinaryDao.kt
index 18b77d6..4bf06d6 100644
--- a/src/jvmMain/kotlin/nl/astraeus/vst/base/db/SampleDao.kt
+++ b/src/jvmMain/kotlin/nl/astraeus/vst/base/db/BinaryDao.kt
@@ -1,6 +1,6 @@
 package nl.astraeus.vst.base.db
 
-object SampleDao {
+object BinaryDao {
   val queryProvider = SampleEntityQueryProvider
 
   fun getSample(waveHash: String): ByteArray {
diff --git a/src/jvmMain/kotlin/nl/astraeus/vst/base/db/SampleEntity.kt b/src/jvmMain/kotlin/nl/astraeus/vst/base/db/BinaryEntity.kt
similarity index 100%
rename from src/jvmMain/kotlin/nl/astraeus/vst/base/db/SampleEntity.kt
rename to src/jvmMain/kotlin/nl/astraeus/vst/base/db/BinaryEntity.kt
diff --git a/src/jvmMain/kotlin/nl/astraeus/vst/base/db/SampleEntityQueryProvider.kt b/src/jvmMain/kotlin/nl/astraeus/vst/base/db/BinaryEntityQueryProvider.kt
similarity index 93%
rename from src/jvmMain/kotlin/nl/astraeus/vst/base/db/SampleEntityQueryProvider.kt
rename to src/jvmMain/kotlin/nl/astraeus/vst/base/db/BinaryEntityQueryProvider.kt
index 946fff5..e7814a3 100644
--- a/src/jvmMain/kotlin/nl/astraeus/vst/base/db/SampleEntityQueryProvider.kt
+++ b/src/jvmMain/kotlin/nl/astraeus/vst/base/db/BinaryEntityQueryProvider.kt
@@ -2,8 +2,8 @@ package nl.astraeus.vst.base.db
 
 import java.sql.ResultSet
 
-val SAMPLE_CREATE_QUERY = """
-  CREATE TABLE SAMPLES (
+val BINARY_CREATE_QUERY = """
+  CREATE TABLE BINARIESYSAMPLES (
     SHA1HASH TEXT,
     FILENAME TEXT,
     LENGTH NUMBER,
diff --git a/src/jvmMain/kotlin/nl/astraeus/vst/base/web/RequestHandler.kt b/src/jvmMain/kotlin/nl/astraeus/vst/base/web/RequestHandler.kt
index 8b61ca6..f292be7 100644
--- a/src/jvmMain/kotlin/nl/astraeus/vst/base/web/RequestHandler.kt
+++ b/src/jvmMain/kotlin/nl/astraeus/vst/base/web/RequestHandler.kt
@@ -77,12 +77,17 @@ class WebsocketHandler(
             }
           }
         }
+
+        // todo: add LOAD_BINARY command which expects a hash,
+        // find the file in the data/files/ directory and send it as binary
       }
     }
   }
 
   override fun onFullBinaryMessage(channel: WebSocketChannel?, message: BufferedBinaryMessage?) {
-    // do nothing yet
+    // todo: create hash from binary, save file in data/files/ directory,
+    // sub directories are 5 characters of the hash per directory
+
   }
 }