consolidated header files and design