Update to use subfolder