Restructuring hdfrc section for angular