Refactoring ResourceProvider into ResourceManager and simplifying everything across the board