Moved clues into their own model