Re-ordered methods in source file to match public header APIs,
Re-ordered private methods in source/header file in a roughly
top down invocation order.
Expect new private methods to go at the end.
Change-Id: Ib8d53cf7268f3ae64d858766fd461170baeee5e7 Signed-off-by: David Steele <david.steele@samsung.com>