Changed project structure to hopefully play nicely with OpenShift.