Move airport to their own layer (cf #155)