Move common classes to a common module