Complete Dino Recoding

The First part of the complete Dino recoding, cleaning up loads off the
stuff...