Update and re-arrange dev requirments