Refractor string/real to a structure that makes sense

Also changing inclusion policy to only include if absolutely necessary