fix package names, tidy up