more sensible directory structure
more sensible directory structure