Review of all item*.py files, mostly just re-ordering.
Merge pull request #1121 from jmaas/master

Review of all item*.py files, mostly just re-ordering.