Moved data model into app itself and out of library.