Refactoring, adapted App flow for web app