updated to new modules, fileinfo interface, mark files