reorganize init defines