increase organization, add additional objects and edit for encapsulation.