Edited templates files to be ready