fix compilation errors.
added missing files
commenced integration