cleanup and organise better

fix wrong path in ESW
Merge branch '8.36'