Restructured comments info into one file