Extra a few things to their own files and move a few other things around.