ServiceMatrix restructure WIP