declutter: move under lib/