Bootstrap re-org

As discussed...