Fine with the restructuring - but can you add a few test cases with non-alpha characters in the filenames so that we can verify that we're not breaking existing behavior?