reorganize library and proxy runner
cosmetic