added various classes and packages