Modularized the app