Consolidating Assets

Remove duplicate Assets by consolidating multiple Assets into a single one and fixing up references.