moved and renamed directories to match production environment
Merge branch 'magnum-308-theme-october' of https://github.com/DellGDC/sherpa into magnum-308-theme-october