subfolder issue fixed