Fixed bad name of templates folder, Fixed bad names of fields and added migration