Revert "Clean Up and Re-Brand"

This reverts commit 32b597baa62ca3d923759c4daad11073322e0b36.