Included files to .gyp file, changes made according to review