Refactor datapackage storing and add lots of comments.