Reordered and fixed Fly locations. Fixes #30.

See #30 for details.