Refactor for directory structure change

Closes #1