package.json added in the configuration
finish merging with pedro branch