ensure alphabetical ordering

- in main.cpp also move 2 locations for class, struct stuff where it
  belongs