A couple more changes

Some updates, some more files renamed, some more code chunks translated