Changed the package diagram to reflect the changes in the implementation