Merge branch 'dev'.

Issue #32: introduce system structure and tode install script to support
it ... not hooked into system yet, as tode support is still under
development.
Issue #32: tweak composition definitions [ci skip]