Preparing to move to a standalone bootstrap package