Fixed File Organization

Removed MMT.Common subfolder