Seperate CollectFilesOperation in own package, add unit test.