Move data model into submodule
make app build with new data model