Changed main module to use common module.