Reorganise the init files a little