Moved data model files into appropriate sub-directory