Restructure fexes

See commits for changes.
Closes one of the remaining Todos in #237