Restructure project and move to XCTest