Restructure factory design