refactor: webapp/logic webapp/models