adjust directory structure to match CMSSW conventions (small refinement)