reorganizing dependencies into lib/