Revert "fx adjusted & placed in the right folders"

This reverts commit 7c00d5c231e9eee6a8d618f1e6d03bb50ca6100e.