Removed unused files and renamed some classes