More spacing changes.
Add some more Swift classes.