generates a workspace instead of subproject

Initial part of [CB-5921](https://issues.apache.org/jira/browse/CB-5921)
I'm not sure what the difference between the CLI and NON_CLI versions of these templates are, but it seems the same treatment you gave this file should be done there as well.