Some simpleification and a package rename.
Merge branch 'test' into dev