Engine semi-remodularization
Boot fix