Modularizing/restructuring the app