re-factor package names, update mapping