Revert "Updated project structure."

This reverts commit 0898d6aaf0337749f9a9d717c3d99e609b5a26c4.