moving a few files around to places that make more sense