MAJ-1094: restructured scm
MAJ-1094: restructured scm