Rearrange Constants to related Classes.