Minor changes, mostly renaming and moving.