more sensible directory structure