Reorganizing the datatypes