update pkg names
update layout and comments