change tag naming; SBF and CMS type alias; small reorg of directories