Re-arrange library
change imports to reflect lib changes
proactive leak checker: delete private records outright
more complete delete on leak checker