Moved magit from site-lisp to Plugins/magit and rewrote SimonInit.el appropriately