misc changes; clean up library layout