Refactoring things to be under the same Xcode project.
Rename workspace
Remove dead code from refactor.
Refactor: It begins!