Revert "Directory Structure"

This reverts commit 99138649d11a8b85f6056415a50ebe5233c1c14d.