Move code from PluginUtils intor PluginManager.
Add external storage support.
Add external storage support.