Modified the app structure to be more logical