refactoring with 'simple' folder