Change structure, continue compilation tests