More moving of classes
Fix for CCPatch creating null characters in lua startup file.
Moved the rest of the files and cleanup of old gui stuff.