Move packages to their correct locations

Move all packages to the correct locations for their tracks