Changed API call to flat folders