[init] re-factoring for standalone usability.