Revert "Initial setup and redesign done"

This reverts commit 74fe540cab2c3a5b95642d16d5e78a3715a5385d.