reorganize init defines
Merge pull request #755 from leoj3n/topic.reorganize

reorganize init defines