Consolidated header files into one