[IC] working on bootstrap and code separation