Better organization in lib/ and scripts/. Refs #8