rename module
move fn into package