Move EDN types into sub-package