removed @[sub]package annotations since we are using namespaces