New upstream version
Start refactoring for podcast directories