Misc updates and reorganization.