restructure flight a bit, add components for source and source list