restructure package, fix #105