deleted files to attempt a merge with master
further removed files to hopefully merge with master
readded files