change folders structure, move files to the right folders, change
recursion method in test file