Restruct lib
Changed docs