A bit of drastic relocation
Remove old directories