Phase2 he 3 bugfixes

* Bug fix  for HF and add skeleton for CFC/HGC
* Missing xml file
* Remove a bad file