Moved files around and added a few utils.