Restructured model package to in app models