Reformat back to BSD (LOL), renames