Completed the refactor.

9 jobs for backend-refactor in 40 minutes and 22 seconds (queued for 3 seconds)