update to structure and names of packages