Reorganize and add stats initial templates