Tidying up annotations
Package renaming