split out new folder into two separate forms

move_to_new_folder and add_new_folder are now two separate html fields
and form items - so that we can more easily manipulate them on the
front end

tests/app/main/views/test_templates.py

@@ -16,11 +16,7 @@ from tests import (
     template_json,
     validate_route_permission,
 )
-from tests.app.main.views.test_template_folders import (
-    CHILD_FOLDER_ID,
-    PARENT_FOLDER_ID,
-    _folder,
-)
+from tests.app.main.views.test_template_folders import PARENT_FOLDER_ID, _folder
 from tests.conftest import (
     SERVICE_ONE_ID,
     SERVICE_TWO_ID,