rework package structure
make addition timeout configurable, move comment