Big commit, refactoring a lot of assets.

Signed-off-by: Ben Corlett <bencorlett@me.com>