more semantical composite pattern
minor refactorings
test compiles again (but still fails)
temp commit (by cron)