Merge EDCM refactoring and modernisation.
Folder reorganisation.