Rename all classes and change structure