Added new organization.

Things are being transformed to be less imperative and
more declarative.