Moved to launcher package