Refactored for folder usage change