restructured the app based on the generator-flight