Added a sane directory structure