Renaming some classes and separating some layers.