Added files, changed project includes