MAJ-1094: restructured scm