Finish refactoring into Controller/Input plugins