Fix package definitions to match directory structure.