Changed the platform wrapping to mirror the others.
Moved the frameworks in the proper groups.