Reorganization of the structure; add of the comment system