Refactor GUIHandler location