Made all changes for the code review.  Remove package that was not in line with the package standards.