Reorganized falconia for clarity