Structural refactorings as a prep for cluster support
 - Testing and simplifying configuration handling
 - Finalize all the things
 - Use generified commands with interfaces