Re-org and more. No enumeration from me on this commit.