Changed Directory Structure
- Prep for openshift integration