Starting to move things into proper files