Remove unneeded directories and add external storage support
Add missing external storage display name