refactored the packages to match the library