Refactored AssetSource into ResourceLocator
Upgraded Clsoure version