Libraries refactoring
Libraries refactoring