Regroup dirrectory and Added task 2.4