Reorganizing using classes folder