diff --git a/.gitignore b/.gitignore
index d36672d..7325885 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,6 @@ public/*.js
 public/*.map
 public/assets/
 
-backend/vendor/
+public/api/vendor/
 
 *.log*
\ No newline at end of file
diff --git a/backend/Db.php b/public/api/Db.php
similarity index 100%
rename from backend/Db.php
rename to public/api/Db.php
diff --git a/backend/Dictionary.php b/public/api/Dictionary.php
similarity index 98%
rename from backend/Dictionary.php
rename to public/api/Dictionary.php
index f2e0db9..6ce890a 100644
--- a/backend/Dictionary.php
+++ b/public/api/Dictionary.php
@@ -143,8 +143,8 @@ WHERE dictionary=$dictionary";
       $result2 = $this->db->query($query2, array(
         ':parts_of_speech' => json_encode($dictionary_object['partsOfSpeech']),
         ':phonology' => json_encode($linguistics['phonology']),
-        ':orthography_notes' => $linguistics['orthographyNotes'],
-        ':grammar_notes' => $linguistics['grammarNotes'],
+        ':orthography_notes' => $linguistics['orthography']['notes'],
+        ':grammar_notes' => $linguistics['grammar']['notes'],
       ));
 
       if ($result2->rowCount() > 0) {
diff --git a/backend/Response.php b/public/api/Response.php
similarity index 93%
rename from backend/Response.php
rename to public/api/Response.php
index b09de0e..cf610f1 100644
--- a/backend/Response.php
+++ b/public/api/Response.php
@@ -1,6 +1,7 @@
 <?php
 class Response {
   private static function defaultHeaders () {
+    header('Access-Control-Allow-Origin: *');
     header('Expires: Sun, 01 Nov 2015 22:46:51 GMT');
     header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0");
     header("Cache-Control: post-check=0, pre-check=0", false);
diff --git a/backend/Token.php b/public/api/Token.php
similarity index 100%
rename from backend/Token.php
rename to public/api/Token.php
diff --git a/backend/User.php b/public/api/User.php
similarity index 100%
rename from backend/User.php
rename to public/api/User.php
diff --git a/backend/composer.json b/public/api/composer.json
similarity index 100%
rename from backend/composer.json
rename to public/api/composer.json
diff --git a/backend/composer.lock b/public/api/composer.lock
similarity index 100%
rename from backend/composer.lock
rename to public/api/composer.lock
diff --git a/backend/index.php b/public/api/index.php
similarity index 100%
rename from backend/index.php
rename to public/api/index.php
diff --git a/backend/structure.sql b/public/api/structure.sql
similarity index 100%
rename from backend/structure.sql
rename to public/api/structure.sql