Revert "Revert "Cleaned up directory structure, again.""

This reverts commit 4b83bade489a46089559e6d99e45da7db1b25627.