Updated packages to reflect new component diagram
Merge branch 'package_refactor'