Fixing Xcode project name
Also some imports in builderKit