Revert "Restructure & add demo view"

This reverts commit 60a29f6adc5fd29df80a1a56cac3326b4ac7a29f.