Moving the DataModel project into src folder