Start of decoupling tank core from config and bundle locations.