Add launcher and improve paths