- Some refactoring : use an unique .h file