directory structure rejig, to allow test project