rejigged directory structure, pulled in .openshift from Nicks repo