Fixed dupe bug, moving packages