restructured all problem numbers, based on original