SDM moved to similar package structure as CLM/AAM