Renamed 1 digit problems, moved some code into general modules,
formatting