Refactoring in folders part 1