Refactor bootstrap
Submodule antigen