Rearranged some code, hopefully fixed the derp with packages