Rename Launcher to Handler & do some cleaning up