Move Paths to DIR stucture part 1