Adepted package and config to new contrib structure.