Revert "Directory structure change."

This reverts commit 35de59d0f971c9d2c5dd5b02d5ed8234282d1ee4.
test