I am ok with moving this eventually, but doing a move+edit in the same PR makes it difficult to see how the code has changed. Perhaps we can move the new code here for now, and just import the classes in their new location?