Package structure modification.

Field Encapsulation.