Simplifying, moving directories, culling all openshift refs