Reworked the Load Folders module to give it a performance boost