Server refactoring
webapp refactored