Workspace refactor

And security fix update.