Updates to iOS header files, organized code