new routing items and changed all paths
fixed merges