support (initially) empty target library; restructure/tidy