Moving classes into subfolder