sync with local improvements, bugfixes

- bugs around default values and dropping props; parsing of cmd line in
general
- moved code into subdir "Configuration"