FIX: Enable this to work with any folder name