fix composer and structure