Remove dependencies of library module to Base