structure

fixed directory structure and merged pull-request #7