significant restructuring, renaming and fixing the configuration part, should start to set now