a little more reorganize infrastructure