Added workspace base classes and made small revisions throughout.