Refactor ByteBitMask and ByteBitSet

Add ShortBitMask and ShortBitSet