updated directory structure. closes #7