Move trip builder and search builder into the core
Spelling