Cleanup code and some refactoring.
Refactored design of workstation package with more composition in favor of inheretance.