Renamed Folders to reflect classes