Fixing iOS Structure