Created new packages, moved functions around