Move common classes to separate assembly