Refactored ResourceLoader modules