Moved to proper cargo location, and fix some instructions