Improved construction: main SConstruct calls to the one in lib/