Refactoring - use wrapper folder