Refactoring datapackage