restructure after ben’s changes
Merge pull request #41 from KyleBrownCS/iOS-structure-2

restructure after ben’s changes