refactor repo. Move part1 of task 6 to subfolder