renamed Shahar's category files, added combined list