Code cleaning. Launcher moved to it's own package.