diff --git a/File.cpp b/ProDOS/File.cpp
similarity index 98%
rename from File.cpp
rename to ProDOS/File.cpp
index 27be514..087dcf7 100644
--- a/File.cpp
+++ b/ProDOS/File.cpp
@@ -6,7 +6,8 @@
  *
  */
 
-#include "File.h"
+#include <ProDOS/File.h>
+#include <ProDOS/DateTime.h>
 
 #include "common.h"
 #include <string.h>
@@ -14,7 +15,6 @@
 #include <ctype.h>
 #include <stdio.h>
 
-#include "DateTime.h"
 
 
 bool FileEntry::Load(const void *data)
diff --git a/File.h b/ProDOS/File.h
similarity index 97%
rename from File.h
rename to ProDOS/File.h
index 1492e99..4d76c86 100644
--- a/File.h
+++ b/ProDOS/File.h
@@ -6,8 +6,8 @@
  *
  */
 
-#ifndef __FILE_H__
-#define __FILE_H__
+#ifndef __PRODOS_FILE_H__
+#define __PRODOS_FILE_H__
 
 #include <time.h>
 #include <stdint.h>