Reorganized and added flight version