Added the ability to use any folders