Relocate Connection traits, updated Schema bilder, misc refactoring