Put all EDM components in own file