Split and move to classes