Renamed folders to make things more uniform.