Revert "Initial Redesign"

This reverts commit d0ceaf985cbc403ee0cd31eb1cbae4b1041f1005.