Restructure the classes in the `classes` folder