Moved model to topic, and topic to vanilla