Rename some files / add some header guards