refactoring adopted (folder ...