Revert "Merge pull request #87 from theodi/subdirectories"

This reverts commit 3ffc27c3c848cc7205aae14785ed94a663ed3ffc, reversing
changes made to b215e818c43590872826d0c5575822085c5dca9e.
Merge pull request #88 from theodi/bugfix-roll-back-subdirectories

Roll back subdirectories