Move identifiers to a better location