Correcting issue #1, header files in subdirectory not being included.