Libs refactoring.