Modify to use the newly arranged eca-shared
Commit after changing eca-shared a bit.