[Refactoring] flight and payment Entities