Rearranged some trees and re-baked lightmapping