Name changes

I moved around and changed the names of several files