Reorganize classes in main POD and add missing classes from recent commits.