Revert "View/Controller"

This reverts commit b4d1d0fa3f43b1abf45b4720dba1b253adc29e82.