huge refactoring, seperated concerns for pluggability layer, more improvements ahead