finalize refactor for two libraries, and include directory
Authored by: npaxton 2006-10-26
Parent: [r366]
Child: [r368]