[DOSGI-242] Refactor provider, Cleanup
65 files changed