Directory Reorgranisation - corrected