Refactoring Everything to Classes
Refactoring Folders