added some new files, deleted headers