Cut the dependency on collective.makesitestructure to facilitate future maintainance