adjust directory structure to match CMSSW conventions