Fixing directory hierarchy