Re-organize fiels