Update and rename test1 to test1/solution.rst