Split out more files, and made more 1.0 compatibility fixes.