(does not compile!) refactoring of package structure

Compiles in eclipse, but not with gradle, because there
are package objects and packages with the same name.