refactored folders