Updated structure of packages and naming of services.