More directory re-arrangement