Clean up and factor out init files.