Partial revert "Tidy old directories"

This reverts commit 0061acc1d85b0852192a861c1dbcdf5a2fd8d421.

Restore the cbdev_utunbu_* directories, as these arn't part of the new
directory structure yet.