This is the first step towards modularization. Handling the move as a separate step rather than combining it should make it easier to rebase other PRs when necessary. --------- Co-authored-by: Orhun Parmaksız <orhunparmaksiz@gmail.com>