Refactor. Put classes in their one files.