Fix directory structure. Closes #1