I have flattened most of Duncan's directory structure, as I have
simpler nofibbing needs.

Will Partain