Restructured project using single app, multiple model pattern