changed some directory oddities to more sensible form