Added the beginning of the big Resource loading refactoring