The great refactoring continues
Continuing moving to GLKit