refactored packages, since TeamRecraft has done next to nothing for this