Merged node headers into one file, modified airport to reflect changes