Fixed dir_bundle creation. Need lots of tidy up.