get rid of flat structure