Fix an error in the Windows code.
Minor iOS framework fix.
Moving files around.