Refactor, rename fact to structure