App - Change: Updated app files to match structured framework