Refactor. New folder structure. One file for one class. New namespaces. New class names