changes to handling of paths and launcher class