Restructuring header files