More restructuring of the solutions file.