Webapps refactoring