Refactoring

(Moving things into their correct place.)