Restructures Eml 2 Deims, adapts to MCM