Restructured assets tree so it's cleaner.