Templates reorganized and "test.py" updated after the previous commit.