Move value classes to the right place.