Guard, moving some files around, and fixes to product and ios::version based off testing/coverage
Forgot to delete the moved files