Re-organize App Scaffold for scalability