Revert "Fixed file hierarchy."

This reverts commit 71e76e4a4d28be4dc1c8794434d5fc1ad9e56b18.