Move the Aspect and Multiverse entities to the main package.