Cleaned up MainController and created DragDropController