Allow for directory structures that do not conform to the year/month/filename convention. re issue #37