Moving to house centric config format