Bug fix for HF and add skeleton for CFC/HGC
remove a bad file