Refactoring classes to subdir