Move optional dependencies into devDependencies