Refactoring to align to modularisation / pip installer