Refactoring the library's modules