diff --git a/.gitignore b/.gitignore
index 7565e14..92ce7df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,12 @@
 /ipch/
 /res/toolset/
 /src/*.h.bak
-/*.sdf
-/*.suo
-/*.user
-/*.opensdf
+/etc/_old_
+/etc/sources/*.tar
+/gui/_old_
+*.sdf
+*.suo
+*.user
+*.opensdf
+*.old
+*.db
diff --git a/etc/check_os.nsh b/etc/check_os.nsh
deleted file mode 100644
index 6539d4a..0000000
--- a/etc/check_os.nsh
+++ /dev/null
@@ -1,38 +0,0 @@
-!include "WinVer.nsh"
-
-Function .onInit
-	System::Call 'kernel32::CreateMutexA(i 0, i 0, t "{79d6a7e5-35af-47b1-a7d6-f20d0e5df772}") i .r1 ?e'
-	Pop $0
-	${If} $0 <> 0
-		MessageBox MB_ICONSTOP|MB_TOPMOST "Sorry, the installer is already running!"
-		Quit
-	${EndIf}
-	
-	; --------
-	
-	${IfNot} ${IsNT}
-		MessageBox MB_TOPMOST|MB_ICONSTOP "Sorry, this application does NOT support Windows 9x !!!"
-		Quit
-	${EndIf}
-	
-	${IfNot} ${AtLeastWinXP}
-		MessageBox MB_TOPMOST|MB_ICONSTOP "Sorry, this application requires Windows XP or later!"
-		Quit
-	${EndIf}
-
-	${If} ${IsWinXP}
-	${AndIf} ${AtMostServicePack} 1
-		MessageBox MB_TOPMOST|MB_ICONSTOP "Sorry, this application requires Service-Pack 2 for Windows XP or later!"
-		ExecShell "open" "http://www.microsoft.com/download/en/details.aspx?id=24"
-		Quit
-	${EndIf}
-	
-	; --------
-	
-	UserInfo::GetAccountType
-	Pop $0
-	${If} $0 != "Admin"
-		MessageBox MB_ICONSTOP|MB_TOPMOST "Your system requires administrative permissions in order to install this software."
-		Quit
-	${EndIf}
-FunctionEnd
diff --git a/etc/finalization.nsh b/etc/finalization.nsh
deleted file mode 100644
index 9f5fbcc..0000000
--- a/etc/finalization.nsh
+++ /dev/null
@@ -1,4 +0,0 @@
-Function .onInstSuccess
-	ExecShell "explore" '$INSTDIR'
-	ExecShell "open" '$INSTDIR\ReadMe.txt'
-FunctionEnd
diff --git a/etc/shortcut.nsh b/etc/shortcut.nsh
deleted file mode 100644
index 62ab57a..0000000
--- a/etc/shortcut.nsh
+++ /dev/null
@@ -1,3 +0,0 @@
-#Create Shortcuts
-MessageBox MB_ICONQUESTION|MB_TOPMOST|MB_YESNO "Create a desktop icon for Simple x264 Launcher?" /SD IDYES IDNO +2
-CreateShortCut "$DESKTOP\Simple x264 Launcher.lnk" "$INSTDIR\x264_launcher.exe"
diff --git a/etc/version.nsh b/etc/version.nsh
deleted file mode 100644
index b686f2c..0000000
--- a/etc/version.nsh
+++ /dev/null
@@ -1,15 +0,0 @@
-!macro X264_VERSIONINFO DATE TIME BUILDNO
-	!searchreplace PRODUCT_VERSION_DATE "${DATE}" "-" "."
-	VIProductVersion "${PRODUCT_VERSION_DATE}.${BUILDNO}"
-	VIAddVersionKey "Author" "LoRd_MuldeR <mulder2@gmx.de>"
-	VIAddVersionKey "Comments" "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
-	VIAddVersionKey "CompanyName" "Free Software Foundation"
-	VIAddVersionKey "FileDescription" "Simple x264 Launcher (${DATE})"
-	VIAddVersionKey "FileVersion" "${DATE}, ${TIME} [Build #${BUILDNO}]"
-	VIAddVersionKey "LegalCopyright" "Copyright 2004-2012 LoRd_MuldeR"
-	VIAddVersionKey "LegalTrademarks" "GNU"
-	VIAddVersionKey "OriginalFilename" "x264_x64.${DATE}.exe"
-	VIAddVersionKey "ProductName" "Simple x264 Launcher"
-	VIAddVersionKey "ProductVersion" "${DATE}, ${TIME} [Build #${BUILDNO}]"
-	VIAddVersionKey "Website" "http://mulder.at.gg/"
-!macroend