2014-10-02-03

Re-ordered source-code (no functional changes)