lot of work on gravi suit

- move and rename two class
- better variable and param name
- use gravi suit fly key, don't add a new key