Some reshuffling of code and adding the beginnings of an unified XML Config system.