Can we merge this to avoid me having to always move the internal package to the proper place when I rebase?