Removed extraneous files and formatted code, still requires commenting
Renamed files