Renamed Launcher classes to avoid confusion with launcher
Old files removed