Reorganize directory structure.
Rip out einhorn dependency.