evitareul: initial re-arranging of init

Change-Id: I19bc1a39dfe2912d712278f6168ff90404277e9f