Asset Commit (Emergency Fix)

I broke the online version, so this fix pretty much reverts all changes
before the new image convention. New changes can be found in nightly.
All the old files are back in the respective folders. No other edits
have been done.