Add new classes.
Change main package.