Moved some handlers and object in the launcher
Added some interfaces that aid in DI