Updated project structure and updated to XCTest.