update package names
update header comment
remove unused imports