new package structure and renamings
even more cleanup
... and cleanup