Added some base classes and packages