Grouped all suggestions into a single file

Updated todo