corrected package typo and split common classes to own package