Move data model to data folder