Adds helium/lithium prefix

Also reorders the parts in the ids, to match the one in the folder structure.