Rename a structure
Some refactor
Some refactor