My reasoning here is that we refactor when needed and not before it's needed. Moving it out will be trivial though no?