Change structure to match proper package