refactoring: model and upgrade to sakai 10