Reorganize internal classes into subfolder