refactored the package lib

cleanings