Change to use main module as dependency and remove old unused module.

Could you check please ?