Refactored to L-expression
Rename and restructure fx-cdi -> fx-inject