Some renaming and removing stuff that shouldn't be there.