Updates for source map, base project structure and invocation