Fixing Directory Class