moved common classes to common package