diff --git a/codemeta_generation.js b/codemeta_generation.js
new file mode 100644
index 0000000..9cd3851
--- /dev/null
+++ b/codemeta_generation.js
@@ -0,0 +1,81 @@
+/**
+ * Copyright (C) 2019  The Software Heritage developers
+ * See the AUTHORS file at the top-level directory of this distribution
+ * License: GNU Affero General Public License version 3, or any later version
+ * See top-level LICENSE file for more information
+ */
+
+"use strict";
+
+function emptyToUndefined(v) {
+    if (v == null || v == "")
+        return undefined;
+    else
+        return v;
+}
+
+function getIfSet(query) {
+    return emptyToUndefined(document.querySelector(query).value);
+}
+
+// Names of codemeta properties with a matching HTML field name
+const directCodemetaFields = [
+    'codeRepository',
+    'contIntegration',
+    'dateCreated',
+    'datePublished',
+    'dateModified',
+    'issueTracker',
+    'name',
+    'version',
+];
+
+function generatePerson(idPrefix) {
+    return {
+        "@type": "Person",
+        "givenName": getIfSet(`#${idPrefix}_givenName`),
+        "familyName": getIfSet(`#${idPrefix}_familyName`),
+        "email": getIfSet(`#${idPrefix}_email`),
+        "@id": getIfSet(`#${idPrefix}_id`),
+    }
+}
+
+function generatePersons(prefix) {
+    var persons = [];
+    var nbPersons = getNbPersons(prefix);
+
+    for (let personId = 1; personId <= nbPersons; personId++) {
+        persons.push(generatePerson(`${prefix}_${personId}`));
+    }
+
+    return persons;
+}
+
+function generateCodemeta() {
+    var inputForm = document.querySelector('#inputForm');
+    var codemetaText;
+    if (inputForm.checkValidity()) {
+        var doc = {
+            "@context": "https://doi.org/10.5063/schema/codemeta-2.0",
+            "@type": "SoftwareSourceCode",
+            "license": "https://spdx.org/licenses/" + getIfSet('#license'),
+        };
+
+        directCodemetaFields.forEach(function (item, index) {
+            doc[item] = getIfSet('#' + item)
+        });
+
+        doc = Object.assign(doc, {
+            "author": generatePersons('author'),
+            "contributor": generatePersons('contributor'),
+        });
+
+        codemetaText = JSON.stringify(doc, null, 4);
+    }
+    else {
+        codemetaText = "invalid input (see error above)";
+        inputForm.reportValidity();
+    }
+
+    document.querySelector('#codemetaText').textContent = codemetaText;
+}
diff --git a/script.js b/dynamic_form.js
similarity index 58%
rename from script.js
rename to dynamic_form.js
index 88d57be..de87762 100644
--- a/script.js
+++ b/dynamic_form.js
@@ -1,164 +1,88 @@
 /**
  * Copyright (C) 2019  The Software Heritage developers
  * See the AUTHORS file at the top-level directory of this distribution
  * License: GNU Affero General Public License version 3, or any later version
  * See top-level LICENSE file for more information
  */
 
 "use strict";
 
-function emptyToUndefined(v) {
-    if (v == null || v == "")
-        return undefined;
-    else
-        return v;
-}
-
-function getIfSet(query) {
-    return emptyToUndefined(document.querySelector(query).value);
-}
-
-function getNbPersons(prefix) {
-    var nbField = document.querySelector(`#${prefix}_nb`);
-    return parseInt(nbField.value, 10);
-}
-
 function createPersonFieldset(personPrefix, legend) {
     // Creates a fieldset containing inputs for informations about a person
     var fieldset = document.createElement("fieldset")
     fieldset.classList.add("person");
     fieldset.id = personPrefix;
     
     fieldset.innerHTML = `
         <legend>${legend}</legend>
         <p>
             <label for="${personPrefix}_givenName">Given name</label>
             <input type="text" id="${personPrefix}_givenName" name="${personPrefix}_givenName"
                 placeholder="Jane" required="true" />
         </p>
         <p>
             <label for="${personPrefix}_familyName">Family name</label>
             <input type="text" id="${personPrefix}_familyName" name="${personPrefix}_familyName"
                 placeholder="Doe" />
         </p>
         <p>
             <label for="${personPrefix}_email">E-mail address</label>
             <input type="email" id="${personPrefix}_email" name="${personPrefix}_email"
                 placeholder="jane.doe@example.org" />
         </p>
         <p>
             <label for="${personPrefix}_id">URI</label>
             <input type="url" id="${personPrefix}_id" name="${personPrefix}_id"
                 placeholder="http://orcid.org/0000-0002-1825-0097" />
         </p>
     `;
 
     return fieldset;
 }
 
 function addPersonWithId(container, legend, prefix, id) {
     var fieldset = createPersonFieldset(`${prefix}_${id}`, `${legend} #${id}`);
 
     container.appendChild(fieldset);
 }
 
 function addPerson(legend, prefix) {
     var container = document.querySelector(`#${prefix}_container`);
     var personId = getNbPersons(prefix) + 1;
 
     addPersonWithId(container, legend, prefix, personId);
 
     var nbPersonsField = container.querySelector(`#${prefix}_nb`);
     nbPersonsField.value = personId;
 }
 
 function removePerson(prefix) {
     var personId = getNbPersons(prefix);
 
     document.querySelector(`#${prefix}_${personId}`).remove();
 
     var nbPersonsField = document.querySelector(`#${prefix}_nb`);
     nbPersonsField.value = personId-1;
 }
 
-// Names of codemeta properties with a matching HTML field name
-const directCodemetaFields = [
-    'codeRepository',
-    'contIntegration',
-    'dateCreated',
-    'datePublished',
-    'dateModified',
-    'issueTracker',
-    'name',
-    'version',
-];
-
-function generatePerson(idPrefix) {
-    return {
-        "@type": "Person",
-        "givenName": getIfSet(`#${idPrefix}_givenName`),
-        "familyName": getIfSet(`#${idPrefix}_familyName`),
-        "email": getIfSet(`#${idPrefix}_email`),
-        "@id": getIfSet(`#${idPrefix}_id`),
-    }
-}
-
-function generatePersons(prefix) {
-    var persons = [];
-    var nbPersons = getNbPersons(prefix);
-
-    for (let personId = 1; personId <= nbPersons; personId++) {
-        persons.push(generatePerson(`${prefix}_${personId}`));
-    }
-
-    return persons;
-}
-
-function generateCodemeta() {
-    var inputForm = document.querySelector('#inputForm');
-    var codemetaText;
-    if (inputForm.checkValidity()) {
-        var doc = {
-            "@context": "https://doi.org/10.5063/schema/codemeta-2.0",
-            "@type": "SoftwareSourceCode",
-            "license": "https://spdx.org/licenses/" + getIfSet('#license'),
-        };
-
-        directCodemetaFields.forEach(function (item, index) {
-            doc[item] = getIfSet('#' + item)
-        });
-
-        doc = Object.assign(doc, {
-            "author": generatePersons('author'),
-            "contributor": generatePersons('contributor'),
-        });
-
-        codemetaText = JSON.stringify(doc, null, 4);
-    }
-    else {
-        codemetaText = "invalid input (see error above)";
-        inputForm.reportValidity();
-    }
-
-    document.querySelector('#codemetaText').textContent = codemetaText;
-}
-
+// Initialize a group of persons (authors, contributors) on page load.
+// Useful if the page is reloaded.
 function initPersons(prefix, legend) {
     var nbAuthors = getNbPersons(prefix);
     var personContainer = document.querySelector(`#${prefix}_container`)
 
     for (let personId = 1; personId <= nbAuthors; personId++) {
         addPersonWithId(personContainer, legend, prefix, personId);
     }
 }
 
 function initCallbacks() {
     document.querySelector('#generateCodemeta')
         .addEventListener('click', generateCodemeta);
 
     document.querySelector('#inputForm')
         .addEventListener('change', generateCodemeta);
 
     initPersons('author', 'Author');
     initPersons('contributor', 'Contributor');
 }
diff --git a/index.html b/index.html
index 78222ff..7423507 100644
--- a/index.html
+++ b/index.html
@@ -1,132 +1,134 @@
 <!doctype html>
 <!--
 Copyright (C) 2019  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 -->
 <html lang="en">
 <head>
     <meta charset="utf-8">
     <title>CodeMeta generator</title>
-    <script src="./script.js"></script>
+    <script src="./utils.js"></script>
+    <script src="./dynamic_form.js"></script>
+    <script src="./codemeta_generation.js"></script>
     <link rel="stylesheet" type="text/css" href="./style.css">
 </head>
 <body>
     <h1>CodeMeta generator</h1>
 
     <p>Most fields are optional. Mandatory fields will be highlighted when generating Codemeta.</p>
 
     <form id="inputForm">
         <fieldset id="fieldsetSoftwareItself">
             <legend>The software itself</legend>
 
             <p title="The name of the software">
                 <label for="name">Name</label>
                 <input type="text" name="name" id="name"
                     placeholder="My Software" />
             </p>
 
             <p title="The date on which the software was created.">
                 <label for="dateCreated">Creation date</label>
                 <input type="date" name="dateCreated" id="dateCreated" />
             </p>
 
             <p title="Date of first publication.">
                 <label for="datePublished">First release date</label>
                 <input type="date" name="datePublished" id="datePublished" />
             </p>
 
             <p>
                 <label for="license">License</label>
                 <select name="license" id="license">
                     <optgroup label="GNU licenses (LGPL/GPL/AGPL)">
                         <option value="GPL-2.0-only">GPL v2.0</option>
                         <option value="GPL-2.0-or-later">GPL v2.0 or later</option>
                         <option value="GPL-3.0-only">GPL v3.0</option>
                         <option value="GPL-3.0-or-later">GPL v3.0 or later</option>
                     </optgroup>
                     <optgroup label="Non-copyleft licenses">
                         <option value="MIT">MIT</option>
                         <option value="Apache-2.0">Apache 2.0</option>
                     </optgroup>
                 </select>
             </p>
         </fieldset>
 
         <fieldset id="fieldsetDevelopmentCommunity">
             <legend>Development community / tools</legend>
 
             <p title="Link to the repository where the un-compiled, human readable code and related code is located (SVN, Git, GitHub, CodePlex, institutional GitLab instance, etc.).">
                 <label for="codeRepository">Code repository</label>
                 <input type="URL" name="codeRepository" id="codeRepository"
                     placeholder="git+https://github.com/You/RepoName.git" />
             </p>
 
             <p title="Link to continuous integration service (Travis-CI, Gitlab CI, etc.).">
                 <label for="contIntegration">Continuous integration</label>
                 <input type="URL" name="contIntegration" id="contIntegration"
                     placeholder="https://travis-ci.org/You/RepoName" />
             </p>
 
             <p title="Link to a place for users/developpers to report and manage bugs (JIRA, GitHub issues, etc.).">
                 <label for="issueTracker">Issue tracker</label>
                 <input type="URL" name="issueTracker" id="issueTracker"
                     placeholder="https://github.com/You/RepoName/issues" />
             </p>
         </fieldset>
 
         <fieldset id="fieldsetCurrentVersion">
             <legend>Current version of the software</legend>
 
             <p title="Version number of the software">
                 <label for="version">Version number</label>
                 <input type="text" name="version" id="version"
                     placeholder="1.0.0" />
             </p>
 
             <p title="The date on which the software was most recently modified.">
                 <label for="dateModified">Release date</label>
                 <input type="date" name="dateModified" id="dateModified" />
             </p>
         </fieldset>
 
         <fieldset class="persons" id="author_container">
             <legend>Authors</legend>
 
             <p>Order of authors does not matter.</p>
 
             <input type="hidden" id="author_nb" value="0" />
             <div id="addRemoveAuthor">
                 <input type="button" id="author_add" value="Add one"
                     onclick="addPerson('Author', 'author');" />
                 <input type="button" id="author_remove" value="Remove last"
                     onclick="removePerson('author');" />
             </div>
         </fieldset>
 
         <fieldset class="persons" id="contributor_container">
             <legend>Contributors</legend>
 
             <p>Order of contributors does not matter.</p>
 
             <input type="hidden" id="contributor_nb" value="0" />
             <div id="addRemoveContributor">
                 <input type="button" id="contributor_add" value="Add one"
                     onclick="addPerson('Contributor', 'contributor');" />
                 <input type="button" id="contributor_remove" value="Remove last"
                     onclick="removePerson('contributor');" />
             </div>
         </fieldset>
     </form>
     <form>
         <input type="button" id="generateCodemeta" value="Generate Codemeta" />
     </form>
 
     <pre contentEditable="true" id="codemetaText"></pre>
 
     <script>
         initCallbacks();
     </script>
 </body>
 </html>
diff --git a/utils.js b/utils.js
new file mode 100644
index 0000000..7e1e0ff
--- /dev/null
+++ b/utils.js
@@ -0,0 +1,13 @@
+/**
+ * Copyright (C) 2019  The Software Heritage developers
+ * See the AUTHORS file at the top-level directory of this distribution
+ * License: GNU Affero General Public License version 3, or any later version
+ * See top-level LICENSE file for more information
+ */
+
+"use strict";
+
+function getNbPersons(prefix) {
+    var nbField = document.querySelector(`#${prefix}_nb`);
+    return parseInt(nbField.value, 10);
+}