Tidy up file structure a little