Add addon, reorganize specs.