Proposed directory structure discussed in #9