Add Swift component
Add Swift Cluster portion and fix typo
Fixes for Swift files