Restructed header files