Renamed packages for eventory
Upgraded unit tests with package renaming