More Cleanup

Removes some obsolete source files, renames a couple variables that were
conflicting with visual studio names. With the exception of the script
loader things should now build on windows.