Organized the project into folders, also getting rid of files which are confusing