Make package level shallower

Instead of a package in a package, adopt a one-package structure.
Subpackages may be added (for example for the GUI) into this package.