Remove holmes-common module
Refactoring