refactoring to the right folder