eddited Units classes to follow the master diagram
Fixed Unit Classes to match master diagram