Adding Groups

- Also merged WorkspaceItem module and AbstractWorkspaceItem class