Reworked folders to align with openShift deployment