Reorganization, updates to paths within lib, and updates to documentation