Adding in files deleted in previous commits
Removing old headers