[FEATURE] cleanup bootstrapping, move code from Core claas to Boostrap class