cleanup and organise better

fix wrong path in ESW