cleanup the filename filter a bit
make di_provider compile again (although not work, much is still missing)
more work on di_provider