Adjusted package setup and fixed a few classes.