More restructuring
Merge branch 'master' of github.com:project-imas/mdm-server