Refactor of specialty and unit into common

Lots of change but it's all in the package name for Unit and Specialty