Organized the project and removed un-needed classes