Renaming some classes and restructuring folder tree