attempt to fix and move some directories around