Moved and split dataspace files