diff --git a/pafish/Makefile b/pafish/Makefile
deleted file mode 100644
index 078c934..0000000
--- a/pafish/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-CC        = i686-w64-mingw32-gcc
-WINDRES   = i686-w64-mingw32-windres
-OBJDIR    = Objects/MingW
-SRC       = $(wildcard *.c)
-OBJ       = $(SRC:%.c=$(OBJDIR)/%.o) $(OBJDIR)/pafish_private.res
-BIN       = Output/MingW/pafish.exe
-LINKOBJ   = $(OBJDIR)/*.o $(OBJDIR)/pafish_private.res
-LIBS      = -s -lws2_32 -liphlpapi -lmpr -lsetupapi
-CXXFLAGS  = -fexpensive-optimizations -O1 -static-libgcc
-CFLAGS    = -fexpensive-optimizations -O1
-GPROF     = i686-pc-mingw32-gprof
-LINKFLAGS = -static-libgcc
-
-ifeq ($(OS),Windows_NT)
-   RM = del /Q
-   FixPath = $(subst /,\,$1)
-else
-   RM = rm -f
-   FixPath = $1
-endif
-LINK      = i686-w64-mingw32-g++
-
-.PHONY: all all-before all-after clean clean-custom
-all: all-before $(BIN) all-after
-
-clean: clean-custom
-	$(RM) $(call FixPath,$(LINKOBJ)) $(call FixPath,$(BIN))
-
-$(BIN): $(OBJ)
-	$(CC) $(LINKFLAGS) $(LINKOBJ) -o $@ $(LIBS) 
-
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) $(DIRS) -c $^ -o $@
-
-$(OBJDIR)/pafish_private.res: $(OBJDIR)/pafish_private.rc 
-	$(WINDRES) --input-format=rc -o $(OBJDIR)/pafish_private.res $(OBJDIR)/pafish_private.rc -O coff
diff --git a/pafish/Makefile.linux b/pafish/Makefile.linux
new file mode 100644
index 0000000..3721229
--- /dev/null
+++ b/pafish/Makefile.linux
@@ -0,0 +1,58 @@
+
+CC        = i686-w64-mingw32-gcc
+LINK      = i686-w64-mingw32-gcc
+WINDRES   = i686-w64-mingw32-windres
+OBJ       = Objects/MingW/main.o Objects/MingW/common.o Objects/MingW/utils.o Objects/MingW/debuggers.o Objects/MingW/sandboxie.o \
+            Objects/MingW/vbox.o Objects/MingW/gensandbox.o Objects/MingW/wine.o Objects/MingW/vmware.o \
+            Objects/MingW/qemu.o Objects/MingW/hooks.o Objects/MingW/pafish_private.res
+LINKOBJ   = $(OBJ)
+LIBS      = -lwsock32 -liphlpapi -lsetupapi -lmpr -s
+INCS      =
+BIN       = Output/MingW/pafish.exe
+CFLAGS    = $(INCS) -O1
+
+all: $(BIN)
+
+clean:
+	rm -f Objects\MingW\*.o
+	rm -f Objects\MingW\*.res
+	rm -f Output\MingW\*.exe
+
+$(BIN): $(OBJ)
+	$(LINK) $(LINKOBJ) -o "$(BIN)" $(LIBS)
+
+Objects/MingW/main.o: $(GLOBALDEPS) main.c
+	$(CC) -c main.c -o Objects/MingW/main.o $(CFLAGS)
+
+Objects/MingW/common.o: $(GLOBALDEPS) common.c
+	$(CC) -c common.c -o Objects/MingW/common.o $(CFLAGS)
+
+Objects/MingW/utils.o: $(GLOBALDEPS) utils.c
+	$(CC) -c utils.c -o Objects/MingW/utils.o $(CFLAGS)
+
+Objects/MingW/debuggers.o: $(GLOBALDEPS) debuggers.c
+	$(CC) -c debuggers.c -o Objects/MingW/debuggers.o $(CFLAGS)
+
+Objects/MingW/sandboxie.o: $(GLOBALDEPS) sandboxie.c
+	$(CC) -c sandboxie.c -o Objects/MingW/sandboxie.o $(CFLAGS)
+
+Objects/MingW/vbox.o: $(GLOBALDEPS) vbox.c
+	$(CC) -c vbox.c -o Objects/MingW/vbox.o $(CFLAGS)
+
+Objects/MingW/gensandbox.o: $(GLOBALDEPS) gensandbox.c
+	$(CC) -c gensandbox.c -o Objects/MingW/gensandbox.o $(CFLAGS)
+
+Objects/MingW/wine.o: $(GLOBALDEPS) wine.c
+	$(CC) -c wine.c -o Objects/MingW/wine.o $(CFLAGS)
+
+Objects/MingW/vmware.o: $(GLOBALDEPS) vmware.c
+	$(CC) -c vmware.c -o Objects/MingW/vmware.o $(CFLAGS)
+
+Objects/MingW/qemu.o: $(GLOBALDEPS) qemu.c
+	$(CC) -c qemu.c -o Objects/MingW/qemu.o $(CFLAGS)
+
+Objects/MingW/hooks.o: $(GLOBALDEPS) hooks.c
+	$(CC) -c hooks.c -o Objects/MingW/hooks.o $(CFLAGS)
+
+Objects/MingW/pafish_private.res: Objects/MingW/pafish_private.rc
+	$(WINDRES) Objects/MingW/pafish_private.rc --input-format=rc -o Objects/MingW/pafish_private.res -O coff
diff --git a/pafish/Makefile.win b/pafish/Makefile.win
index e92100b..4d72853 100644
--- a/pafish/Makefile.win
+++ b/pafish/Makefile.win
@@ -9,7 +9,7 @@ LINKOBJ   = $(OBJ)
 LIBS      = -L"C:/MinGW32/lib" -lwsock32 -liphlpapi -lsetupapi -lmpr -s
 INCS      = -I"C:/MinGW32/include"
 BIN       = Output/MingW/pafish.exe
-CFLAGS    = $(INCS) $(DEFINES) -O1
+CFLAGS    = $(INCS) -O1
 
 all: $(BIN)
 
diff --git a/pafish/Objects/MingW/pafish_private.h b/pafish/Objects/MingW/pafish_private.h
deleted file mode 100644
index aa98ecd..0000000
--- a/pafish/Objects/MingW/pafish_private.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#ifndef PAFISH_PRIVATE_H
-#define PAFISH_PRIVATE_H
-
-/* VERSION DEFINITIONS */
-#define VER_STRING	"0.3.0.1"
-#define VER_MAJOR	0
-#define VER_MINOR	3
-#define VER_RELEASE	0
-#define VER_BUILD	1
-#define COMPANY_NAME	""
-#define FILE_VERSION	""
-#define FILE_DESCRIPTION	"Paranoid Fish is paranoid"
-#define INTERNAL_NAME	""
-#define LEGAL_COPYRIGHT	""
-#define LEGAL_TRADEMARKS	""
-#define ORIGINAL_FILENAME	""
-#define PRODUCT_NAME	"Paranoid Fish"
-#define PRODUCT_VERSION	""
-
-#endif /*PAFISH_PRIVATE_H*/
diff --git a/pafish/pafish.dev b/pafish/pafish.dev
deleted file mode 100644
index c464d46..0000000
--- a/pafish/pafish.dev
+++ /dev/null
@@ -1,278 +0,0 @@
-[Project]
-FileName=pafish.dev
-Name=pafish
-UnitCount=19
-PchHead=-1
-PchSource=-1
-Ver=3
-IsCpp=1
-ProfilesCount=2
-ProfileIndex=0
-Folders=
-
-[Unit1]
-FileName=main.c
-CompileCpp=0
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=0
-Minor=3
-Release=0
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=
-FileDescription=Paranoid Fish is paranoid
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=Paranoid Fish
-ProductVersion=
-AutoIncBuildNrOnRebuild=0
-AutoIncBuildNrOnCompile=0
-UnitCount=19
-
-[Profile1]
-ProfileName=MingW gcc
-Type=1
-ObjFiles=
-Includes=
-Libs=
-ResourceIncludes=
-MakeIncludes=
-Compiler=
-CppCompiler=
-Linker=
-PreprocDefines=
-CompilerSettings=0000000001100000000100
-Icon=pafish.ico
-ExeOutput=Output\MingW
-ImagesOutput=Images\
-ObjectOutput=Objects\MingW
-OverrideOutput=0
-OverrideOutputName=pafish.exe
-HostApplication=
-CommandLine=
-UseCustomMakefile=0
-CustomMakefile=
-IncludeVersionInfo=1
-SupportXPThemes=0
-CompilerSet=0
-CompilerType=0
-
-[Profile2]
-ProfileName=MS Visual C++
-Type=1
-ObjFiles=
-Includes=
-Libs=
-ResourceIncludes=
-MakeIncludes=
-Compiler=
-CppCompiler=
-Linker=
-PreprocDefines=
-CompilerSettings=000000000000010000000000000000000000
-Icon=
-ExeOutput=Output\Visual C++
-ImagesOutput=Images\
-ObjectOutput=Objects\Visual C++
-OverrideOutput=0
-OverrideOutputName=
-HostApplication=
-CommandLine=
-UseCustomMakefile=0
-CustomMakefile=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=9
-CompilerType=9
-
-[Unit2]
-FileName=vbox.h
-CompileCpp=1
-Folder=pafish
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit3]
-FileName=common.c
-CompileCpp=0
-Folder=pafish
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c common.c -o Objects/MingW/common.o $(CFLAGS)
-
-[Unit4]
-FileName=common.h
-CompileCpp=1
-Folder=pafish
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit5]
-FileName=debuggers.c
-CompileCpp=0
-Folder=pafish
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c debuggers.c -o Objects/MingW/debuggers.o $(CFLAGS)
-
-[Unit6]
-FileName=debuggers.h
-CompileCpp=1
-Folder=pafish
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit7]
-FileName=sandboxie.c
-CompileCpp=0
-Folder=pafish
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c sandboxie.c -o Objects/MingW/sandboxie.o $(CFLAGS)
-
-[Unit8]
-FileName=sandboxie.h
-CompileCpp=1
-Folder=pafish
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit9]
-FileName=vbox.c
-CompileCpp=0
-Folder=pafish
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c vbox.c -o Objects/MingW/vbox.o $(CFLAGS)
-
-[Unit10]
-FileName=gensandbox.h
-CompileCpp=1
-Folder=pafish
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit11]
-FileName=gensandbox.c
-CompileCpp=0
-Folder=pafish
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c gensandbox.c -o Objects/MingW/gensandbox.o $(CFLAGS)
-
-[Unit12]
-FileName=wine.c
-CompileCpp=0
-Folder=pafish
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c wine.c -o Objects/MingW/wine.o $(CFLAGS)
-
-[Unit13]
-FileName=wine.h
-CompileCpp=1
-Folder=pafish
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit14]
-FileName=vmware.c
-CompileCpp=0
-Folder=pafish
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c vmware.c -o Objects/MingW/vmware.o $(CFLAGS)
-
-[Unit15]
-FileName=vmware.h
-CompileCpp=1
-Folder=pafish
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit16]
-FileName=qemu.h
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit17]
-FileName=qemu.c
-CompileCpp=0
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c qemu.c -o Objects/MingW/qemu.o $(CFLAGS)
-
-[Unit18]
-FileName=hooks.c
-CompileCpp=0
-Folder=pafish
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c hooks.c -o Objects/MingW/hooks.o $(CFLAGS)
-
-[Unit19]
-FileName=hooks.h
-CompileCpp=1
-Folder=pafish
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
diff --git a/pafish/pafish.layout b/pafish/pafish.layout
deleted file mode 100644
index a13118a..0000000
--- a/pafish/pafish.layout
+++ /dev/null
@@ -1,100 +0,0 @@
-[Editors]
-Focused=0
-Order=0
-[Editor_0]
-Open=1
-Top=1
-CursorCol=19
-CursorRow=2
-TopLine=249
-LeftChar=1
-[Editor_6]
-CursorCol=1
-CursorRow=14
-TopLine=1
-LeftChar=1
-[Editor_7]
-CursorCol=1
-CursorRow=8
-TopLine=1
-LeftChar=1
-[Editor_8]
-CursorCol=54
-CursorRow=19
-TopLine=102
-LeftChar=1
-[Editor_2]
-CursorCol=1
-CursorRow=24
-TopLine=39
-LeftChar=1
-[Editor_5]
-CursorCol=1
-CursorRow=12
-TopLine=1
-LeftChar=1
-[Editor_4]
-CursorCol=28
-CursorRow=18
-TopLine=22
-LeftChar=1
-[Editor_3]
-CursorCol=1
-CursorRow=20
-TopLine=1
-LeftChar=1
-[Editor_1]
-CursorCol=18
-CursorRow=11
-TopLine=1
-LeftChar=1
-[Editor_9]
-CursorCol=1
-CursorRow=14
-TopLine=1
-LeftChar=1
-[Editor_10]
-CursorCol=2
-CursorRow=84
-TopLine=64
-LeftChar=1
-[Editor_11]
-CursorCol=1
-CursorRow=21
-TopLine=1
-LeftChar=1
-[Editor_12]
-CursorCol=1
-CursorRow=8
-TopLine=1
-LeftChar=1
-[Editor_13]
-CursorCol=1
-CursorRow=4
-TopLine=51
-LeftChar=1
-[Editor_14]
-CursorCol=1
-CursorRow=14
-TopLine=1
-LeftChar=1
-[Editor_15]
-CursorCol=1
-CursorRow=10
-TopLine=1
-LeftChar=1
-[Editor_16]
-CursorCol=54
-CursorRow=19
-TopLine=48
-LeftChar=1
-[Editor_17]
-CursorCol=1
-CursorRow=1
-TopLine=6
-LeftChar=1
-[Editor_18]
-CursorCol=1
-CursorRow=8
-TopLine=1
-LeftChar=1