separate new data structure

Put new data structure for the workspace in separate file.