Moved various configs closer to the bundle for organizational purposes