Reorganize FEX source
Many things are named inconsistently, and others are too complex.

Simplify