Refactor recipes
Refactor structure