packagify app and models
Merge branch 'reorg'