Renamed, added doc description, reorganized