Fixing Directory Organization and naming