reordered lib
reorganized lib, merged with head of the standard fork