Merge conflicts

Merge our changes; the directory structure got changed.
Changes are too large for here, see changelog.

Import flex 2.6.0