Refactored Packages for Organization