restructing the app for the module