fixed bugs and move to the second dir

TOT