Added launcher and renamed some stuff