Moved listeners, added dependency loader