Moving inherited classes into subfolders