more tidying
A few directory struct changes