Move factories into a factories folder