Cleaned up init files to separate location avoiding warning from 24.4.