Fixed some recipes and moved some modules to better spots