Refactor things into files