big refactoring: renamed packages, full support for new datamodel