changed some files around