diff --git a/uefiextract.cpp b/UEFIExtract/uefiextract.cpp
similarity index 100%
rename from uefiextract.cpp
rename to UEFIExtract/uefiextract.cpp
diff --git a/uefiextract.h b/UEFIExtract/uefiextract.h
similarity index 94%
rename from uefiextract.h
rename to UEFIExtract/uefiextract.h
index 88bd301..1c839c5 100644
--- a/uefiextract.h
+++ b/UEFIExtract/uefiextract.h
@@ -19,8 +19,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <QString>
 #include <QFileInfo>
 
-#include "basetypes.h"
-#include "ffsengine.h"
+#include "../basetypes.h"
+#include "../ffsengine.h"
 
 class UEFIExtract : public QObject
 {
diff --git a/UEFIExtract/uefiextract.pro b/UEFIExtract/uefiextract.pro
new file mode 100644
index 0000000..ebf542d
--- /dev/null
+++ b/UEFIExtract/uefiextract.pro
@@ -0,0 +1,40 @@
+QT       += core
+QT       -= gui
+
+TARGET    = UEFIExtract
+TEMPLATE  = app
+CONFIG   += console
+
+SOURCES  += uefiextract_main.cpp \
+ uefiextract.cpp \
+ ../types.cpp \
+ ../descriptor.cpp \
+ ../ffs.cpp \
+ ../ffsengine.cpp \
+ ../treeitem.cpp \
+ ../treemodel.cpp \
+ ../LZMA/LzmaCompress.c \
+ ../LZMA/LzmaDecompress.c \
+ ../LZMA/SDK/C/LzFind.c \
+ ../LZMA/SDK/C/LzmaDec.c \
+ ../LZMA/SDK/C/LzmaEnc.c \
+ ../Tiano/EfiTianoDecompress.c \
+ ../Tiano/EfiTianoCompress.c
+
+HEADERS  += uefiextract.h \
+ ../basetypes.h \
+ ../descriptor.h \
+ ../gbe.h \
+ ../me.h \
+ ../ffs.h \
+ ../peimage.h \
+ ../types.h \
+ ../ffsengine.h \
+ ../treeitem.h \
+ ../treemodel.h \
+ ../messagelistitem.h \
+ ../LZMA/LzmaCompress.h \
+ ../LZMA/LzmaDecompress.h \
+ ../Tiano/EfiTianoDecompress.h \
+ ../Tiano/EfiTianoCompress.h
+ 
\ No newline at end of file
diff --git a/uefiextract_main.cpp b/UEFIExtract/uefiextract_main.cpp
similarity index 100%
rename from uefiextract_main.cpp
rename to UEFIExtract/uefiextract_main.cpp
diff --git a/uefiextract.pro b/uefiextract.pro
deleted file mode 100644
index b7be22a..0000000
--- a/uefiextract.pro
+++ /dev/null
@@ -1,41 +0,0 @@
-QT       += core
-QT       -= gui
-
-TARGET    = UEFIExtract
-TEMPLATE  = app
-CONFIG   += console
-
-SOURCES  += uefiextract_main.cpp \
- uefiextract.cpp \
- types.cpp \
- descriptor.cpp \
- ffs.cpp \
- ffsengine.cpp \
- treeitem.cpp \
- treemodel.cpp \
- messagelistitem.cpp \
- LZMA/LzmaCompress.c \
- LZMA/LzmaDecompress.c \
- LZMA/SDK/C/LzFind.c \
- LZMA/SDK/C/LzmaDec.c \
- LZMA/SDK/C/LzmaEnc.c \
- Tiano/EfiTianoDecompress.c \
- Tiano/EfiTianoCompress.c
-
-HEADERS  += uefiextract.h \
- basetypes.h \
- descriptor.h \
- gbe.h \
- me.h \
- ffs.h \
- peimage.h \
- types.h \
- ffsengine.h \
- treeitem.h \
- treemodel.h \
- messagelistitem.h \
- LZMA/LzmaCompress.h \
- LZMA/LzmaDecompress.h \
- Tiano/EfiTianoDecompress.h \
- Tiano/EfiTianoCompress.h
- 
\ No newline at end of file