Beginning of library refactoring