Asset Changes

Relocated all assets
Proper JSON Loading