changes the path to include header files, changes data structures names to avoid confusion