Refactor: move common libs to general scope