Move around code to more logical destination
8 files changed