refactored packages for future improvements