Small reorg + Xcode suggested changes
Small reorg + Xcode suggested changes

akaralar/siesta,bustoutsolutions/siesta,andrewloyola/siesta,onekiloparsec/siesta,akaralar/siesta,andrewloyola/siesta,onekiloparsec/siesta,bustoutsolutions/siesta