diff --git a/Bitmap.cpp b/ProDOS/Bitmap.cpp
similarity index 97%
rename from Bitmap.cpp
rename to ProDOS/Bitmap.cpp
index 1e3d246..57ed601 100644
--- a/Bitmap.cpp
+++ b/ProDOS/Bitmap.cpp
@@ -1,11 +1,11 @@
 #include <cstring>
 
-#include "Bitmap.h"
-#include "BlockDevice.h"
+#include <ProDOS/Bitmap.h>
+#include <ProDOS/BlockDevice.h>
 #include "auto.h"
 
 
-using namespace ProFUSE;
+using namespace ProDOS;
 
 // returns # of 1-bits set (0-8)
 inline static unsigned popCount(uint8_t x)
diff --git a/Bitmap.h b/ProDOS/Bitmap.h
similarity index 90%
rename from Bitmap.h
rename to ProDOS/Bitmap.h
index 243db9d..77388a6 100644
--- a/Bitmap.h
+++ b/ProDOS/Bitmap.h
@@ -5,7 +5,7 @@
 
 
 
-namespace ProFUSE {
+namespace ProDOS {
 
 class BlockDevice;
 
@@ -15,7 +15,7 @@ public:
 
     Bitmap(unsigned blocks);
     Bitmap(BlockDevice *device, unsigned keyPointer, unsigned blocks);
-    //todo -- constructor by loading fro, block device...
+    //todo -- constructor by loading from, block device...
     ~Bitmap();
     
     int allocBlock();