Reoranised requirements, once again, to allow both ci and setup to work correctly