Merged EntityCore into World, added AspectBuilder, fixed some other weirdness.