switch to more sensible directory structure