Workspace integration

integrated default unix/windows workspaces  from Carlos into the git sources and builds