Library classes structure refactoring.