refactored and cleaned up xcode proj to reflect new direction of project