First pass of ported code from Obj-C 209 to Swift 2014.
Fixed some layout issues and moved a file.