modularization structure
reenabled bootstrap as submodule