Reorder some of the declarations and alhpabetize files

Since this is largely from the autoconvert, set the package up for
future development by sorting the file list (there will be more
additions to this list, I'm certain) and placing the basic
declarations at the top.

No actual code changed.