restructure package
add setup