add messages to folders, reorganize files