Reorganize init file