Changed the cleanup.bat and moved some files around