refactor directory structure (closes #5)
test scripts too (closes #20)
merge branch refactor5