Reorganize templates
Add CHANGELOG