Organizing classes into relevant folders. Refactoring namespaces accordingly.