Move Toy.v to Core.v, updates from Ed