Fix dependencies in package.json

Moving dependencies where they belong... Some of was in the depDevdencies but they are not!