Refactor

Remove static, factories, remove extend in filter, extends service providers and more test