Beginning refactor with 10 problems per file to limit # of files in repo