RESTRUCTURE PACKAGES
-Adjusted packages to reflect architectural diagramms