directory structure rejig