First Cleanup

I still need to clean up a lot more but that implies MUCH less moving of files, which is good.
Note: more moving of files creates more possibilities for git to get confused.

You will NEED to copy the .project and .classpath inside of the folder to your desktop BEFORE pulling this to your computer. Paste both files back in afterwards, that way they will be ignored by git.