Cargoify.

Old build system left intact (except for minor change to to use new directory structure).