application and website refactoring