Removed unused files. Organized classes into folders