Split some things into different files