Moving directories arounds
Fixing for newer servers