Added all files in both workspaces, first full commit