Re-organized packages, renamed classes.