diff --git a/ACNL_REditor.pro b/ACNL_REditor.pro
index bd23bde..5e8ef66 100644
--- a/ACNL_REditor.pro
+++ b/ACNL_REditor.pro
@@ -11,7 +11,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = ACNL_REditor
 RC_ICONS = icon.ico
 TEMPLATE = app
-RESOURCES = resources.qrc
+RESOURCES = Resources/resources.qrc
 
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which has been marked as deprecated (the exact warnings
@@ -32,26 +32,26 @@ CONFIG += c++11
 
 
 SOURCES += \
-        main.cpp \
-        mainwindow.cpp \
-        file.cpp \
-        game.cpp \
-        shophourseditor.cpp \
-        itemrandomiser.cpp \
-        patch.cpp \
-    aboutwindow.cpp
+        Sources/main.cpp \
+        Sources/mainwindow.cpp \
+        Sources/file.cpp \
+        Sources/game.cpp \
+        Sources/shophourseditor.cpp \
+        Sources/itemrandomiser.cpp \
+        Sources/patch.cpp \
+        Sources/aboutwindow.cpp
 
 HEADERS += \
-        mainwindow.h \
-        file.h \
-        game.h \
-        shophourseditor.h \
-        itemrandomiser.h \
-        patch.h \
-    aboutwindow.h
+        Headers/mainwindow.h \
+        Headers/file.h \
+        Headers/game.h \
+        Headers/shophourseditor.h \
+        Headers/itemrandomiser.h \
+        Headers/patch.h \
+        Headers/aboutwindow.h
 
 FORMS += \
-        mainwindow.ui \
-        shophourseditor.ui \
-        itemrandomiser.ui \
-    aboutwindow.ui
+        Forms/mainwindow.ui \
+        Forms/shophourseditor.ui \
+        Forms/itemrandomiser.ui \
+        Forms/aboutwindow.ui
diff --git a/aboutwindow.ui b/Forms/aboutwindow.ui
similarity index 100%
rename from aboutwindow.ui
rename to Forms/aboutwindow.ui
diff --git a/itemrandomiser.ui b/Forms/itemrandomiser.ui
similarity index 100%
rename from itemrandomiser.ui
rename to Forms/itemrandomiser.ui
diff --git a/mainwindow.ui b/Forms/mainwindow.ui
similarity index 100%
rename from mainwindow.ui
rename to Forms/mainwindow.ui
diff --git a/shophourseditor.ui b/Forms/shophourseditor.ui
similarity index 100%
rename from shophourseditor.ui
rename to Forms/shophourseditor.ui
diff --git a/aboutwindow.h b/Headers/aboutwindow.h
similarity index 100%
rename from aboutwindow.h
rename to Headers/aboutwindow.h
diff --git a/file.h b/Headers/file.h
similarity index 100%
rename from file.h
rename to Headers/file.h
diff --git a/game.h b/Headers/game.h
similarity index 93%
rename from game.h
rename to Headers/game.h
index d032f31..b8e3481 100644
--- a/game.h
+++ b/Headers/game.h
@@ -4,10 +4,10 @@
 #include <QFile>
 #include <QFileDialog>
 #include "file.h"
-#include "itemrandomiser.h"
+#include "Headers/itemrandomiser.h"
 #include "ui_mainwindow.h"
-#include "shophourseditor.h"
-#include "patch.h"
+#include "Headers/shophourseditor.h"
+#include "Headers/patch.h"
 
 struct Dir_s {
     bool exist = false;
diff --git a/itemrandomiser.h b/Headers/itemrandomiser.h
similarity index 100%
rename from itemrandomiser.h
rename to Headers/itemrandomiser.h
diff --git a/mainwindow.h b/Headers/mainwindow.h
similarity index 97%
rename from mainwindow.h
rename to Headers/mainwindow.h
index 0f743c4..2029068 100644
--- a/mainwindow.h
+++ b/Headers/mainwindow.h
@@ -2,7 +2,7 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
-#include "game.h"
+#include "Headers/game.h"
 
 namespace Ui {
 class MainWindow;
diff --git a/patch.h b/Headers/patch.h
similarity index 100%
rename from patch.h
rename to Headers/patch.h
diff --git a/shophourseditor.h b/Headers/shophourseditor.h
similarity index 100%
rename from shophourseditor.h
rename to Headers/shophourseditor.h
diff --git a/resources.qrc b/Resources/resources.qrc
similarity index 58%
rename from resources.qrc
rename to Resources/resources.qrc
index c1270d0..619648d 100644
--- a/resources.qrc
+++ b/Resources/resources.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>resources/icon.png</file>
+        <file>icon.png</file>
     </qresource>
 </RCC>
diff --git a/aboutwindow.cpp b/Sources/aboutwindow.cpp
similarity index 92%
rename from aboutwindow.cpp
rename to Sources/aboutwindow.cpp
index 75dce92..7e2e892 100644
--- a/aboutwindow.cpp
+++ b/Sources/aboutwindow.cpp
@@ -1,4 +1,4 @@
-#include "aboutwindow.h"
+#include "Headers/aboutwindow.h"
 #include "ui_aboutwindow.h"
 #include <QPushButton>
 
diff --git a/file.cpp b/Sources/file.cpp
similarity index 96%
rename from file.cpp
rename to Sources/file.cpp
index 414b776..837879d 100644
--- a/file.cpp
+++ b/Sources/file.cpp
@@ -1,5 +1,5 @@
-#include "file.h"
-#include "mainwindow.h"
+#include "Headers/file.h"
+#include "Headers/mainwindow.h"
 #include "ui_mainwindow.h"
 
 File::File() : m_md5Hash(QCryptographicHash::Md5) { }
diff --git a/game.cpp b/Sources/game.cpp
similarity index 99%
rename from game.cpp
rename to Sources/game.cpp
index 3fe8694..a96ef9e 100644
--- a/game.cpp
+++ b/Sources/game.cpp
@@ -1,5 +1,5 @@
-#include "game.h"
-#include "mainwindow.h"
+#include "Headers/game.h"
+#include "Headers/mainwindow.h"
 
 /* Each entry relative to Game_s */
 QString TIDs[8] = {"0004000000086200", "0004000000086300", "0004000000086400", "0004000000086500",  //Orig Game
diff --git a/itemrandomiser.cpp b/Sources/itemrandomiser.cpp
similarity index 99%
rename from itemrandomiser.cpp
rename to Sources/itemrandomiser.cpp
index 4b93332..4c12028 100644
--- a/itemrandomiser.cpp
+++ b/Sources/itemrandomiser.cpp
@@ -1,4 +1,4 @@
-#include "itemrandomiser.h"
+#include "Headers/itemrandomiser.h"
 #include "ui_itemrandomiser.h"
 #include <QDebug>
 #include <QTime>
diff --git a/main.cpp b/Sources/main.cpp
similarity index 76%
rename from main.cpp
rename to Sources/main.cpp
index 3620d07..85480bb 100644
--- a/main.cpp
+++ b/Sources/main.cpp
@@ -1,6 +1,6 @@
-#include "mainwindow.h"
+#include "Headers/mainwindow.h"
 #include <QApplication>
-#include "file.h"
+#include "Headers/file.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/mainwindow.cpp b/Sources/mainwindow.cpp
similarity index 96%
rename from mainwindow.cpp
rename to Sources/mainwindow.cpp
index 2a7f7d6..c59e00c 100644
--- a/mainwindow.cpp
+++ b/Sources/mainwindow.cpp
@@ -1,11 +1,11 @@
-#include "mainwindow.h"
+#include "Headers/mainwindow.h"
 #include "ui_mainwindow.h"
-#include "aboutwindow.h"
-#include "itemrandomiser.h"
-#include "shophourseditor.h"
-#include "file.h"
-#include "game.h"
-#include "patch.h"
+#include "Headers/aboutwindow.h"
+#include "Headers/itemrandomiser.h"
+#include "Headers/shophourseditor.h"
+#include "Headers/file.h"
+#include "Headers/game.h"
+#include "Headers/patch.h"
 
 static const QString SpeedStrings[5] = {"Normal: x1", "Fast: x1.25", "Faster: x1.5", "Speedy: x2", "Speeding Bullet: x3"};
 static QVector<ItemPrice_s*> ItemPrices;
diff --git a/patch.cpp b/Sources/patch.cpp
similarity index 99%
rename from patch.cpp
rename to Sources/patch.cpp
index 13613fa..a91166b 100644
--- a/patch.cpp
+++ b/Sources/patch.cpp
@@ -1,4 +1,4 @@
-#include "patch.h"
+#include "Headers/patch.h"
 
 ShopCodeOffsets_s Retail = {0xA0,0x90,0x60,0xAC,false, true};
 ShopCodeOffsets_s Nooklings[5] = {{0x84,0x88,0x5C,0x274,true, false},{0x10C,0xFC,0xCC,0x274,false, true},{0x168,0x16C,0x140,0x274,true, false},{0x1F0,0x1E0,0x1B0,0x274,false, true},{0x24C,0x250,0x224,0x274,true, false}};
diff --git a/shophourseditor.cpp b/Sources/shophourseditor.cpp
similarity index 99%
rename from shophourseditor.cpp
rename to Sources/shophourseditor.cpp
index 29f50a5..72ce675 100644
--- a/shophourseditor.cpp
+++ b/Sources/shophourseditor.cpp
@@ -1,4 +1,4 @@
-#include "shophourseditor.h"
+#include "Headers/shophourseditor.h"
 #include "ui_shophourseditor.h"
 #include <QDebug>
 #include <QTime>