objectified merged into master

The transision to a proper namespace per module.