Reorganized file structure to work with OpenShift