Refactored folders