Moved public functions into container objects. Refs #38