Bumped dependencies
Remove generic config file and move to specific files