Provider class was moved to separate file