Added a few classes, new packages