refactored the package code into a separate file and updated the imports