comment functionality + changes is back in new structure. extract file and form edit work