General first pass clean up.  Convert to i18n JSON.  Add auto load definitions.