Renamed datatypes folders for clarity