Rearranged the packages again, fixed up the exploding arrow a bit