Refactoring, moving the original workspace to here (these were copies)