Move hammerhead stuff to vendor and organize