Updated refrences for the restructure of the factories
Solved merge conflicts