Moving everything into classes