Revert "Updated Project Structure"

This reverts commit 505a3a3e9c2af785e3e767ab6e2ce9d987acd5b1.