Changed run-ci to use classes