move CFCs to subdirectory