Move common to imported dir and start using common code also