Finally decided to leave main app in base package