modified the header files paths to adapt to the new organizes