Modularized the App