Merge pull request #1652 from reaperhulk/move-ec

Move EC interface definitions