Restructure paths so they are more logical