changed some more filenames, and .h dependencies added