Refactoring folders structure inserting details