Moved some dev dependencies in main dependencies