reorganized a few library sources