move air related classes to seperate source dir