Rationalised directory structure.  Simpified filter.