diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..ea28aa6d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,18 @@
+* text=auto
+.github/ export-ignore
+.gitignore export-ignore
+.gitattributes export-ignore
+
+.phpstorm.meta.php export-ignore
+
+tests/ export-ignore
+phpunit.xml export-ignore
+
+composer.json export-ignore
+composer.lock export-ignore
+
+mix-manifest.json export-ignore
+package.json export-ignore
+package-lock.json export-ignore
+webpack.mix.js export-ignore
+webpack.config.js export-ignore
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 00000000..121eea10
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,63 @@
+# @link https://leoloso.com/posts/github-action-to-release-wp-plugin/
+# Creates a zip file containing the installable plugin.
+# Steps:
+# - Checkout the source code.
+# - Run "composer install" to download all dependencies.
+# - Use `git archive` to create a zip file.
+# - Manually add the `vendor/` directory to that zip file. (Little gross.)
+# - Upload the .zip file as an artifact to the action.
+# - Upload the .zip file to the release, for download.
+
+name: Generate Installable Plugin, and Upload as Release Asset
+
+# Controls wh en the workflow will run.
+on:
+  # Triggers when a new release is published.
+  release:
+    types: [published]
+    
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel.
+jobs:
+  build:
+    name: Upload Release Asset
+    runs-on: ubuntu-latest
+    
+    # Steps represent a sequence of tasks that will be executed as part of the job.
+    steps:
+      # Checks out the source code.
+      - name: Checkout code
+        uses: actions/checkout@v2
+        
+      # Runs "composer install" and creates the build directory.
+      - name: Build project
+        run: |
+          composer install --no-dev --optimize-autoloader
+          mkdir build
+          mkdir ${{ github.event.repository.name }}
+          mv vendor/ ${{ github.event.repository.name }}/
+          
+      # Create the zip file. Note that this won't include vendor/, we have to add that next.
+      - name: Create artifact
+        run: |
+          git archive --prefix ${{ github.event.repository.name }}/ -o build/${{ github.event.repository.name }}-${{ github.event.release.name }}.zip HEAD
+          
+      # Manually add the vendor/ directory into the zip file.
+      - name: Add vendor files
+        uses: montudor/action-zip@v0.1.0
+        with:
+          args: zip -ur build/${{ github.event.repository.name }}-${{ github.event.release.name }}.zip ${{ github.event.repository.name }}/
+          
+      # Uploads the zip file to the action.
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+            name: ${{ github.event.repository.name }}-${{ github.event.release.name }}
+            path: build/${{ github.event.repository.name }}-${{ github.event.release.name }}.zip
+            
+      # Attaches the zip file to the release.
+      - name: Upload to release
+        uses: JasonEtco/upload-to-release@master
+        with:
+          args: build/${{ github.event.repository.name }}-${{ github.event.release.name }}.zip application/zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index a80335fa..c6284b0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ npm-debug.log
 *.sass.map
 *.scss.map
 /node_modules/
+/vendor/
 
 # amcharts spam
 assets/js/build/vendors~canvg.min.js
diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
new file mode 100644
index 00000000..960c4604
--- /dev/null
+++ b/.phpstorm.meta.php
@@ -0,0 +1,11 @@
+<?php
+namespace PHPSTORM_META {
+    // Allow PhpStorm IDE to resolve return types when calling book_database( Object_Type::class ) or book_database( `Object_Type` ).
+    override(
+        \Book_Database\book_database( 0 ),
+        map( [
+            '' => '@',
+            '' => '@Class',
+        ] )
+    );
+}
diff --git a/assets/js/build/alpine.min.js b/assets/js/build/alpine.min.js
new file mode 100644
index 00000000..69e438a6
--- /dev/null
+++ b/assets/js/build/alpine.min.js
@@ -0,0 +1,5 @@
+(()=>{var qe=!1,Ue=!1,F=[];function kt(e){tn(e)}function tn(e){F.includes(e)||F.push(e),rn()}function he(e){let t=F.indexOf(e);t!==-1&&F.splice(t,1)}function rn(){!Ue&&!qe&&(qe=!0,queueMicrotask(nn))}function nn(){qe=!1,Ue=!0;for(let e=0;e<F.length;e++)F[e]();F.length=0,Ue=!1}var A,K,Y,We,Ge=!0;function It(e){Ge=!1,e(),Ge=!0}function Pt(e){A=e.reactive,Y=e.release,K=t=>e.effect(t,{scheduler:r=>{Ge?kt(r):r()}}),We=e.raw}function Ye(e){K=e}function Dt(e){let t=()=>{};return[n=>{let i=K(n);e._x_effects||(e._x_effects=new Set,e._x_runEffects=()=>{e._x_effects.forEach(o=>o())}),e._x_effects.add(i),t=()=>{i!==void 0&&(e._x_effects.delete(i),Y(i))}},()=>{t()}]}var $t=[],Lt=[],jt=[];function Ft(e){jt.push(e)}function _e(e,t){typeof t=="function"?(e._x_cleanups||(e._x_cleanups=[]),e._x_cleanups.push(t)):(t=e,Lt.push(t))}function Kt(e){$t.push(e)}function Bt(e,t,r){e._x_attributeCleanups||(e._x_attributeCleanups={}),e._x_attributeCleanups[t]||(e._x_attributeCleanups[t]=[]),e._x_attributeCleanups[t].push(r)}function Je(e,t){!e._x_attributeCleanups||Object.entries(e._x_attributeCleanups).forEach(([r,n])=>{(t===void 0||t.includes(r))&&(n.forEach(i=>i()),delete e._x_attributeCleanups[r])})}var Qe=new MutationObserver(Ze),Xe=!1;function et(){Qe.observe(document,{subtree:!0,childList:!0,attributes:!0,attributeOldValue:!0}),Xe=!0}function sn(){on(),Qe.disconnect(),Xe=!1}var te=[],tt=!1;function on(){te=te.concat(Qe.takeRecords()),te.length&&!tt&&(tt=!0,queueMicrotask(()=>{an(),tt=!1}))}function an(){Ze(te),te.length=0}function m(e){if(!Xe)return e();sn();let t=e();return et(),t}var rt=!1,ge=[];function zt(){rt=!0}function Vt(){rt=!1,Ze(ge),ge=[]}function Ze(e){if(rt){ge=ge.concat(e);return}let t=[],r=[],n=new Map,i=new Map;for(let o=0;o<e.length;o++)if(!e[o].target._x_ignoreMutationObserver&&(e[o].type==="childList"&&(e[o].addedNodes.forEach(s=>s.nodeType===1&&t.push(s)),e[o].removedNodes.forEach(s=>s.nodeType===1&&r.push(s))),e[o].type==="attributes")){let s=e[o].target,a=e[o].attributeName,c=e[o].oldValue,l=()=>{n.has(s)||n.set(s,[]),n.get(s).push({name:a,value:s.getAttribute(a)})},u=()=>{i.has(s)||i.set(s,[]),i.get(s).push(a)};s.hasAttribute(a)&&c===null?l():s.hasAttribute(a)?(u(),l()):u()}i.forEach((o,s)=>{Je(s,o)}),n.forEach((o,s)=>{$t.forEach(a=>a(s,o))});for(let o of r)if(!t.includes(o)&&(Lt.forEach(s=>s(o)),o._x_cleanups))for(;o._x_cleanups.length;)o._x_cleanups.pop()();t.forEach(o=>{o._x_ignoreSelf=!0,o._x_ignore=!0});for(let o of t)r.includes(o)||!o.isConnected||(delete o._x_ignoreSelf,delete o._x_ignore,jt.forEach(s=>s(o)),o._x_ignore=!0,o._x_ignoreSelf=!0);t.forEach(o=>{delete o._x_ignoreSelf,delete o._x_ignore}),t=null,r=null,n=null,i=null}function xe(e){return I(k(e))}function T(e,t,r){return e._x_dataStack=[t,...k(r||e)],()=>{e._x_dataStack=e._x_dataStack.filter(n=>n!==t)}}function nt(e,t){let r=e._x_dataStack[0];Object.entries(t).forEach(([n,i])=>{r[n]=i})}function k(e){return e._x_dataStack?e._x_dataStack:typeof ShadowRoot=="function"&&e instanceof ShadowRoot?k(e.host):e.parentNode?k(e.parentNode):[]}function I(e){let t=new Proxy({},{ownKeys:()=>Array.from(new Set(e.flatMap(r=>Object.keys(r)))),has:(r,n)=>e.some(i=>i.hasOwnProperty(n)),get:(r,n)=>(e.find(i=>{if(i.hasOwnProperty(n)){let o=Object.getOwnPropertyDescriptor(i,n);if(o.get&&o.get._x_alreadyBound||o.set&&o.set._x_alreadyBound)return!0;if((o.get||o.set)&&o.enumerable){let s=o.get,a=o.set,c=o;s=s&&s.bind(t),a=a&&a.bind(t),s&&(s._x_alreadyBound=!0),a&&(a._x_alreadyBound=!0),Object.defineProperty(i,n,{...c,get:s,set:a})}return!0}return!1})||{})[n],set:(r,n,i)=>{let o=e.find(s=>s.hasOwnProperty(n));return o?o[n]=i:e[e.length-1][n]=i,!0}});return t}function ye(e){let t=n=>typeof n=="object"&&!Array.isArray(n)&&n!==null,r=(n,i="")=>{Object.entries(Object.getOwnPropertyDescriptors(n)).forEach(([o,{value:s,enumerable:a}])=>{if(a===!1||s===void 0)return;let c=i===""?o:`${i}.${o}`;typeof s=="object"&&s!==null&&s._x_interceptor?n[o]=s.initialize(e,c,o):t(s)&&s!==n&&!(s instanceof Element)&&r(s,c)})};return r(e)}function be(e,t=()=>{}){let r={initialValue:void 0,_x_interceptor:!0,initialize(n,i,o){return e(this.initialValue,()=>cn(n,i),s=>it(n,i,s),i,o)}};return t(r),n=>{if(typeof n=="object"&&n!==null&&n._x_interceptor){let i=r.initialize.bind(r);r.initialize=(o,s,a)=>{let c=n.initialize(o,s,a);return r.initialValue=c,i(o,s,a)}}else r.initialValue=n;return r}}function cn(e,t){return t.split(".").reduce((r,n)=>r[n],e)}function it(e,t,r){if(typeof t=="string"&&(t=t.split(".")),t.length===1)e[t[0]]=r;else{if(t.length===0)throw error;return e[t[0]]||(e[t[0]]={}),it(e[t[0]],t.slice(1),r)}}var Ht={};function y(e,t){Ht[e]=t}function re(e,t){return Object.entries(Ht).forEach(([r,n])=>{Object.defineProperty(e,`$${r}`,{get(){let[i,o]=ot(t);return i={interceptor:be,...i},_e(t,o),n(t,i)},enumerable:!1})}),e}function qt(e,t,r,...n){try{return r(...n)}catch(i){J(i,e,t)}}function J(e,t,r=void 0){Object.assign(e,{el:t,expression:r}),console.warn(`Alpine Expression Error: ${e.message}
+
+${r?'Expression: "'+r+`"
+
+`:""}`,t),setTimeout(()=>{throw e},0)}function N(e,t,r={}){let n;return g(e,t)(i=>n=i,r),n}function g(...e){return Ut(...e)}var Ut=st;function Wt(e){Ut=e}function st(e,t){let r={};re(r,e);let n=[r,...k(e)];if(typeof t=="function")return ln(n,t);let i=un(n,t,e);return qt.bind(null,e,t,i)}function ln(e,t){return(r=()=>{},{scope:n={},params:i=[]}={})=>{let o=t.apply(I([n,...e]),i);ve(r,o)}}var at={};function fn(e,t){if(at[e])return at[e];let r=Object.getPrototypeOf(async function(){}).constructor,n=/^[\n\s]*if.*\(.*\)/.test(e)||/^(let|const)\s/.test(e)?`(() => { ${e} })()`:e,o=(()=>{try{return new r(["__self","scope"],`with (scope) { __self.result = ${n} }; __self.finished = true; return __self.result;`)}catch(s){return J(s,t,e),Promise.resolve()}})();return at[e]=o,o}function un(e,t,r){let n=fn(t,r);return(i=()=>{},{scope:o={},params:s=[]}={})=>{n.result=void 0,n.finished=!1;let a=I([o,...e]);if(typeof n=="function"){let c=n(n,a).catch(l=>J(l,r,t));n.finished?(ve(i,n.result,a,s,r),n.result=void 0):c.then(l=>{ve(i,l,a,s,r)}).catch(l=>J(l,r,t)).finally(()=>n.result=void 0)}}}function ve(e,t,r,n,i){if(typeof t=="function"){let o=t.apply(r,n);o instanceof Promise?o.then(s=>ve(e,s,r,n)).catch(s=>J(s,i,t)):e(o)}else e(t)}var ct="x-";function w(e=""){return ct+e}function Gt(e){ct=e}var Yt={};function p(e,t){Yt[e]=t}function ne(e,t,r){let n={};return Array.from(t).map(Jt((o,s)=>n[o]=s)).filter(Zt).map(pn(n,r)).sort(mn).map(o=>dn(e,o))}function Qt(e){return Array.from(e).map(Jt()).filter(t=>!Zt(t))}var lt=!1,ie=new Map,Xt=Symbol();function er(e){lt=!0;let t=Symbol();Xt=t,ie.set(t,[]);let r=()=>{for(;ie.get(t).length;)ie.get(t).shift()();ie.delete(t)},n=()=>{lt=!1,r()};e(r),n()}function ot(e){let t=[],r=a=>t.push(a),[n,i]=Dt(e);return t.push(i),[{Alpine:P,effect:n,cleanup:r,evaluateLater:g.bind(g,e),evaluate:N.bind(N,e)},()=>t.forEach(a=>a())]}function dn(e,t){let r=()=>{},n=Yt[t.type]||r,[i,o]=ot(e);Bt(e,t.original,o);let s=()=>{e._x_ignore||e._x_ignoreSelf||(n.inline&&n.inline(e,t,i),n=n.bind(n,e,t,i),lt?ie.get(Xt).push(n):n())};return s.runCleanups=o,s}var we=(e,t)=>({name:r,value:n})=>(r.startsWith(e)&&(r=r.replace(e,t)),{name:r,value:n}),Ee=e=>e;function Jt(e=()=>{}){return({name:t,value:r})=>{let{name:n,value:i}=tr.reduce((o,s)=>s(o),{name:t,value:r});return n!==t&&e(n,t),{name:n,value:i}}}var tr=[];function Z(e){tr.push(e)}function Zt({name:e}){return rr().test(e)}var rr=()=>new RegExp(`^${ct}([^:^.]+)\\b`);function pn(e,t){return({name:r,value:n})=>{let i=r.match(rr()),o=r.match(/:([a-zA-Z0-9\-:]+)/),s=r.match(/\.[^.\]]+(?=[^\]]*$)/g)||[],a=t||e[r]||r;return{type:i?i[1]:null,value:o?o[1]:null,modifiers:s.map(c=>c.replace(".","")),expression:n,original:a}}}var ut="DEFAULT",Se=["ignore","ref","data","id","bind","init","for","model","modelable","transition","show","if",ut,"teleport","element"];function mn(e,t){let r=Se.indexOf(e.type)===-1?ut:e.type,n=Se.indexOf(t.type)===-1?ut:t.type;return Se.indexOf(r)-Se.indexOf(n)}function B(e,t,r={}){e.dispatchEvent(new CustomEvent(t,{detail:r,bubbles:!0,composed:!0,cancelable:!0}))}var ft=[],dt=!1;function Oe(e){ft.push(e),queueMicrotask(()=>{dt||setTimeout(()=>{Ae()})})}function Ae(){for(dt=!1;ft.length;)ft.shift()()}function nr(){dt=!0}function C(e,t){if(typeof ShadowRoot=="function"&&e instanceof ShadowRoot){Array.from(e.children).forEach(i=>C(i,t));return}let r=!1;if(t(e,()=>r=!0),r)return;let n=e.firstElementChild;for(;n;)C(n,t,!1),n=n.nextElementSibling}function z(e,...t){console.warn(`Alpine Warning: ${e}`,...t)}function or(){document.body||z("Unable to initialize. Trying to load Alpine before `<body>` is available. Did you forget to add `defer` in Alpine's `<script>` tag?"),B(document,"alpine:init"),B(document,"alpine:initializing"),et(),Ft(t=>E(t,C)),_e(t=>hn(t)),Kt((t,r)=>{ne(t,r).forEach(n=>n())});let e=t=>!V(t.parentElement,!0);Array.from(document.querySelectorAll(ir())).filter(e).forEach(t=>{E(t)}),B(document,"alpine:initialized")}var pt=[],sr=[];function ar(){return pt.map(e=>e())}function ir(){return pt.concat(sr).map(e=>e())}function Te(e){pt.push(e)}function Ce(e){sr.push(e)}function V(e,t=!1){return Q(e,r=>{if((t?ir():ar()).some(i=>r.matches(i)))return!0})}function Q(e,t){if(!!e){if(t(e))return e;if(e._x_teleportBack&&(e=e._x_teleportBack),!!e.parentElement)return Q(e.parentElement,t)}}function cr(e){return ar().some(t=>e.matches(t))}function E(e,t=C){er(()=>{t(e,(r,n)=>{ne(r,r.attributes).forEach(i=>i()),r._x_ignore&&n()})})}function hn(e){C(e,t=>Je(t))}function oe(e,t){return Array.isArray(t)?lr(e,t.join(" ")):typeof t=="object"&&t!==null?_n(e,t):typeof t=="function"?oe(e,t()):lr(e,t)}function lr(e,t){let r=o=>o.split(" ").filter(Boolean),n=o=>o.split(" ").filter(s=>!e.classList.contains(s)).filter(Boolean),i=o=>(e.classList.add(...o),()=>{e.classList.remove(...o)});return t=t===!0?t="":t||"",i(n(t))}function _n(e,t){let r=a=>a.split(" ").filter(Boolean),n=Object.entries(t).flatMap(([a,c])=>c?r(a):!1).filter(Boolean),i=Object.entries(t).flatMap(([a,c])=>c?!1:r(a)).filter(Boolean),o=[],s=[];return i.forEach(a=>{e.classList.contains(a)&&(e.classList.remove(a),s.push(a))}),n.forEach(a=>{e.classList.contains(a)||(e.classList.add(a),o.push(a))}),()=>{s.forEach(a=>e.classList.add(a)),o.forEach(a=>e.classList.remove(a))}}function H(e,t){return typeof t=="object"&&t!==null?gn(e,t):xn(e,t)}function gn(e,t){let r={};return Object.entries(t).forEach(([n,i])=>{r[n]=e.style[n],n.startsWith("--")||(n=yn(n)),e.style.setProperty(n,i)}),setTimeout(()=>{e.style.length===0&&e.removeAttribute("style")}),()=>{H(e,r)}}function xn(e,t){let r=e.getAttribute("style",t);return e.setAttribute("style",t),()=>{e.setAttribute("style",r||"")}}function yn(e){return e.replace(/([a-z])([A-Z])/g,"$1-$2").toLowerCase()}function se(e,t=()=>{}){let r=!1;return function(){r?t.apply(this,arguments):(r=!0,e.apply(this,arguments))}}p("transition",(e,{value:t,modifiers:r,expression:n},{evaluate:i})=>{typeof n=="function"&&(n=i(n)),n?bn(e,n,t):vn(e,r,t)});function bn(e,t,r){ur(e,oe,""),{enter:i=>{e._x_transition.enter.during=i},"enter-start":i=>{e._x_transition.enter.start=i},"enter-end":i=>{e._x_transition.enter.end=i},leave:i=>{e._x_transition.leave.during=i},"leave-start":i=>{e._x_transition.leave.start=i},"leave-end":i=>{e._x_transition.leave.end=i}}[r](t)}function vn(e,t,r){ur(e,H);let n=!t.includes("in")&&!t.includes("out")&&!r,i=n||t.includes("in")||["enter"].includes(r),o=n||t.includes("out")||["leave"].includes(r);t.includes("in")&&!n&&(t=t.filter((h,b)=>b<t.indexOf("out"))),t.includes("out")&&!n&&(t=t.filter((h,b)=>b>t.indexOf("out")));let s=!t.includes("opacity")&&!t.includes("scale"),a=s||t.includes("opacity"),c=s||t.includes("scale"),l=a?0:1,u=c?ae(t,"scale",95)/100:1,d=ae(t,"delay",0),x=ae(t,"origin","center"),M="opacity, transform",W=ae(t,"duration",150)/1e3,pe=ae(t,"duration",75)/1e3,f="cubic-bezier(0.4, 0.0, 0.2, 1)";i&&(e._x_transition.enter.during={transformOrigin:x,transitionDelay:d,transitionProperty:M,transitionDuration:`${W}s`,transitionTimingFunction:f},e._x_transition.enter.start={opacity:l,transform:`scale(${u})`},e._x_transition.enter.end={opacity:1,transform:"scale(1)"}),o&&(e._x_transition.leave.during={transformOrigin:x,transitionDelay:d,transitionProperty:M,transitionDuration:`${pe}s`,transitionTimingFunction:f},e._x_transition.leave.start={opacity:1,transform:"scale(1)"},e._x_transition.leave.end={opacity:l,transform:`scale(${u})`})}function ur(e,t,r={}){e._x_transition||(e._x_transition={enter:{during:r,start:r,end:r},leave:{during:r,start:r,end:r},in(n=()=>{},i=()=>{}){Re(e,t,{during:this.enter.during,start:this.enter.start,end:this.enter.end},n,i)},out(n=()=>{},i=()=>{}){Re(e,t,{during:this.leave.during,start:this.leave.start,end:this.leave.end},n,i)}})}window.Element.prototype._x_toggleAndCascadeWithTransitions=function(e,t,r,n){let i=()=>{document.visibilityState==="visible"?requestAnimationFrame(r):setTimeout(r)};if(t){e._x_transition&&(e._x_transition.enter||e._x_transition.leave)?e._x_transition.enter&&(Object.entries(e._x_transition.enter.during).length||Object.entries(e._x_transition.enter.start).length||Object.entries(e._x_transition.enter.end).length)?e._x_transition.in(r):i():e._x_transition?e._x_transition.in(r):i();return}e._x_hidePromise=e._x_transition?new Promise((o,s)=>{e._x_transition.out(()=>{},()=>o(n)),e._x_transitioning.beforeCancel(()=>s({isFromCancelledTransition:!0}))}):Promise.resolve(n),queueMicrotask(()=>{let o=fr(e);o?(o._x_hideChildren||(o._x_hideChildren=[]),o._x_hideChildren.push(e)):queueMicrotask(()=>{let s=a=>{let c=Promise.all([a._x_hidePromise,...(a._x_hideChildren||[]).map(s)]).then(([l])=>l());return delete a._x_hidePromise,delete a._x_hideChildren,c};s(e).catch(a=>{if(!a.isFromCancelledTransition)throw a})})})};function fr(e){let t=e.parentNode;if(!!t)return t._x_hidePromise?t:fr(t)}function Re(e,t,{during:r,start:n,end:i}={},o=()=>{},s=()=>{}){if(e._x_transitioning&&e._x_transitioning.cancel(),Object.keys(r).length===0&&Object.keys(n).length===0&&Object.keys(i).length===0){o(),s();return}let a,c,l;wn(e,{start(){a=t(e,n)},during(){c=t(e,r)},before:o,end(){a(),l=t(e,i)},after:s,cleanup(){c(),l()}})}function wn(e,t){let r,n,i,o=se(()=>{m(()=>{r=!0,n||t.before(),i||(t.end(),Ae()),t.after(),e.isConnected&&t.cleanup(),delete e._x_transitioning})});e._x_transitioning={beforeCancels:[],beforeCancel(s){this.beforeCancels.push(s)},cancel:se(function(){for(;this.beforeCancels.length;)this.beforeCancels.shift()();o()}),finish:o},m(()=>{t.start(),t.during()}),nr(),requestAnimationFrame(()=>{if(r)return;let s=Number(getComputedStyle(e).transitionDuration.replace(/,.*/,"").replace("s",""))*1e3,a=Number(getComputedStyle(e).transitionDelay.replace(/,.*/,"").replace("s",""))*1e3;s===0&&(s=Number(getComputedStyle(e).animationDuration.replace("s",""))*1e3),m(()=>{t.before()}),n=!0,requestAnimationFrame(()=>{r||(m(()=>{t.end()}),Ae(),setTimeout(e._x_transitioning.finish,s+a),i=!0)})})}function ae(e,t,r){if(e.indexOf(t)===-1)return r;let n=e[e.indexOf(t)+1];if(!n||t==="scale"&&isNaN(n))return r;if(t==="duration"){let i=n.match(/([0-9]+)ms/);if(i)return i[1]}return t==="origin"&&["top","right","left","center","bottom"].includes(e[e.indexOf(t)+2])?[n,e[e.indexOf(t)+2]].join(" "):n}var mt=!1;function D(e,t=()=>{}){return(...r)=>mt?t(...r):e(...r)}function dr(e,t){t._x_dataStack||(t._x_dataStack=e._x_dataStack),mt=!0,Sn(()=>{En(t)}),mt=!1}function En(e){let t=!1;E(e,(n,i)=>{C(n,(o,s)=>{if(t&&cr(o))return s();t=!0,i(o,s)})})}function Sn(e){let t=K;Ye((r,n)=>{let i=t(r);return Y(i),()=>{}}),e(),Ye(t)}function ce(e,t,r,n=[]){switch(e._x_bindings||(e._x_bindings=A({})),e._x_bindings[t]=r,t=n.includes("camel")?Rn(t):t,t){case"value":An(e,r);break;case"style":Tn(e,r);break;case"class":On(e,r);break;default:Cn(e,t,r);break}}function An(e,t){if(e.type==="radio")e.attributes.value===void 0&&(e.value=t),window.fromModel&&(e.checked=pr(e.value,t));else if(e.type==="checkbox")Number.isInteger(t)?e.value=t:!Number.isInteger(t)&&!Array.isArray(t)&&typeof t!="boolean"&&![null,void 0].includes(t)?e.value=String(t):Array.isArray(t)?e.checked=t.some(r=>pr(r,e.value)):e.checked=!!t;else if(e.tagName==="SELECT")Mn(e,t);else{if(e.value===t)return;e.value=t}}function On(e,t){e._x_undoAddedClasses&&e._x_undoAddedClasses(),e._x_undoAddedClasses=oe(e,t)}function Tn(e,t){e._x_undoAddedStyles&&e._x_undoAddedStyles(),e._x_undoAddedStyles=H(e,t)}function Cn(e,t,r){[null,void 0,!1].includes(r)&&kn(t)?e.removeAttribute(t):(mr(t)&&(r=t),Nn(e,t,r))}function Nn(e,t,r){e.getAttribute(t)!=r&&e.setAttribute(t,r)}function Mn(e,t){let r=[].concat(t).map(n=>n+"");Array.from(e.options).forEach(n=>{n.selected=r.includes(n.value)})}function Rn(e){return e.toLowerCase().replace(/-(\w)/g,(t,r)=>r.toUpperCase())}function pr(e,t){return e==t}function mr(e){return["disabled","checked","required","readonly","hidden","open","selected","autofocus","itemscope","multiple","novalidate","allowfullscreen","allowpaymentrequest","formnovalidate","autoplay","controls","loop","muted","playsinline","default","ismap","reversed","async","defer","nomodule"].includes(e)}function kn(e){return!["aria-pressed","aria-checked","aria-expanded","aria-selected"].includes(e)}function hr(e,t,r){if(e._x_bindings&&e._x_bindings[t]!==void 0)return e._x_bindings[t];let n=e.getAttribute(t);return n===null?typeof r=="function"?r():r:mr(t)?!![t,"true"].includes(n):n===""?!0:n}function Me(e,t){var r;return function(){var n=this,i=arguments,o=function(){r=null,e.apply(n,i)};clearTimeout(r),r=setTimeout(o,t)}}function Ne(e,t){let r;return function(){let n=this,i=arguments;r||(e.apply(n,i),r=!0,setTimeout(()=>r=!1,t))}}function _r(e){e(P)}var q={},gr=!1;function xr(e,t){if(gr||(q=A(q),gr=!0),t===void 0)return q[e];q[e]=t,typeof t=="object"&&t!==null&&t.hasOwnProperty("init")&&typeof t.init=="function"&&q[e].init(),ye(q[e])}function yr(){return q}var br={};function vr(e,t){br[e]=typeof t!="function"?()=>t:t}function wr(e){return Object.entries(br).forEach(([t,r])=>{Object.defineProperty(e,t,{get(){return(...n)=>r(...n)}})}),e}var Er={};function Sr(e,t){Er[e]=t}function Ar(e,t){return Object.entries(Er).forEach(([r,n])=>{Object.defineProperty(e,r,{get(){return(...i)=>n.bind(t)(...i)},enumerable:!1})}),e}var In={get reactive(){return A},get release(){return Y},get effect(){return K},get raw(){return We},version:"3.9.1",flushAndStopDeferringMutations:Vt,disableEffectScheduling:It,setReactivityEngine:Pt,closestDataStack:k,skipDuringClone:D,addRootSelector:Te,addInitSelector:Ce,addScopeToNode:T,deferMutations:zt,mapAttributes:Z,evaluateLater:g,setEvaluator:Wt,mergeProxies:I,findClosest:Q,closestRoot:V,interceptor:be,transition:Re,setStyles:H,mutateDom:m,directive:p,throttle:Ne,debounce:Me,evaluate:N,initTree:E,nextTick:Oe,prefixed:w,prefix:Gt,plugin:_r,magic:y,store:xr,start:or,clone:dr,bound:hr,$data:xe,data:Sr,bind:vr},P=In;function ht(e,t){let r=Object.create(null),n=e.split(",");for(let i=0;i<n.length;i++)r[n[i]]=!0;return t?i=>!!r[i.toLowerCase()]:i=>!!r[i]}var Qo={[1]:"TEXT",[2]:"CLASS",[4]:"STYLE",[8]:"PROPS",[16]:"FULL_PROPS",[32]:"HYDRATE_EVENTS",[64]:"STABLE_FRAGMENT",[128]:"KEYED_FRAGMENT",[256]:"UNKEYED_FRAGMENT",[512]:"NEED_PATCH",[1024]:"DYNAMIC_SLOTS",[2048]:"DEV_ROOT_FRAGMENT",[-1]:"HOISTED",[-2]:"BAIL"},Xo={[1]:"STABLE",[2]:"DYNAMIC",[3]:"FORWARDED"};var Pn="itemscope,allowfullscreen,formnovalidate,ismap,nomodule,novalidate,readonly";var es=ht(Pn+",async,autofocus,autoplay,controls,default,defer,disabled,hidden,loop,open,required,reversed,scoped,seamless,checked,muted,multiple,selected");var Or=Object.freeze({}),ts=Object.freeze([]);var _t=Object.assign;var Dn=Object.prototype.hasOwnProperty,le=(e,t)=>Dn.call(e,t),$=Array.isArray,X=e=>Tr(e)==="[object Map]";var $n=e=>typeof e=="string",ke=e=>typeof e=="symbol",ue=e=>e!==null&&typeof e=="object";var Ln=Object.prototype.toString,Tr=e=>Ln.call(e),gt=e=>Tr(e).slice(8,-1);var Ie=e=>$n(e)&&e!=="NaN"&&e[0]!=="-"&&""+parseInt(e,10)===e;var Pe=e=>{let t=Object.create(null);return r=>t[r]||(t[r]=e(r))},jn=/-(\w)/g,rs=Pe(e=>e.replace(jn,(t,r)=>r?r.toUpperCase():"")),Fn=/\B([A-Z])/g,ns=Pe(e=>e.replace(Fn,"-$1").toLowerCase()),xt=Pe(e=>e.charAt(0).toUpperCase()+e.slice(1)),is=Pe(e=>e?`on${xt(e)}`:""),yt=(e,t)=>e!==t&&(e===e||t===t);var bt=new WeakMap,fe=[],R,U=Symbol("iterate"),vt=Symbol("Map key iterate");function Kn(e){return e&&e._isEffect===!0}function Cr(e,t=Or){Kn(e)&&(e=e.raw);let r=Bn(e,t);return t.lazy||r(),r}function Mr(e){e.active&&(Rr(e),e.options.onStop&&e.options.onStop(),e.active=!1)}var zn=0;function Bn(e,t){let r=function(){if(!r.active)return e();if(!fe.includes(r)){Rr(r);try{return Vn(),fe.push(r),R=r,e()}finally{fe.pop(),Nr(),R=fe[fe.length-1]}}};return r.id=zn++,r.allowRecurse=!!t.allowRecurse,r._isEffect=!0,r.active=!0,r.raw=e,r.deps=[],r.options=t,r}function Rr(e){let{deps:t}=e;if(t.length){for(let r=0;r<t.length;r++)t[r].delete(e);t.length=0}}var ee=!0,wt=[];function Hn(){wt.push(ee),ee=!1}function Vn(){wt.push(ee),ee=!0}function Nr(){let e=wt.pop();ee=e===void 0?!0:e}function O(e,t,r){if(!ee||R===void 0)return;let n=bt.get(e);n||bt.set(e,n=new Map);let i=n.get(r);i||n.set(r,i=new Set),i.has(R)||(i.add(R),R.deps.push(i),R.options.onTrack&&R.options.onTrack({effect:R,target:e,type:t,key:r}))}function L(e,t,r,n,i,o){let s=bt.get(e);if(!s)return;let a=new Set,c=u=>{u&&u.forEach(d=>{(d!==R||d.allowRecurse)&&a.add(d)})};if(t==="clear")s.forEach(c);else if(r==="length"&&$(e))s.forEach((u,d)=>{(d==="length"||d>=n)&&c(u)});else switch(r!==void 0&&c(s.get(r)),t){case"add":$(e)?Ie(r)&&c(s.get("length")):(c(s.get(U)),X(e)&&c(s.get(vt)));break;case"delete":$(e)||(c(s.get(U)),X(e)&&c(s.get(vt)));break;case"set":X(e)&&c(s.get(U));break}let l=u=>{u.options.onTrigger&&u.options.onTrigger({effect:u,target:e,key:r,type:t,newValue:n,oldValue:i,oldTarget:o}),u.options.scheduler?u.options.scheduler(u):u()};a.forEach(l)}var qn=ht("__proto__,__v_isRef,__isVue"),kr=new Set(Object.getOwnPropertyNames(Symbol).map(e=>Symbol[e]).filter(ke)),Un=De(),Wn=De(!1,!0),Gn=De(!0),Yn=De(!0,!0),$e={};["includes","indexOf","lastIndexOf"].forEach(e=>{let t=Array.prototype[e];$e[e]=function(...r){let n=_(this);for(let o=0,s=this.length;o<s;o++)O(n,"get",o+"");let i=t.apply(n,r);return i===-1||i===!1?t.apply(n,r.map(_)):i}});["push","pop","shift","unshift","splice"].forEach(e=>{let t=Array.prototype[e];$e[e]=function(...r){Hn();let n=t.apply(this,r);return Nr(),n}});function De(e=!1,t=!1){return function(n,i,o){if(i==="__v_isReactive")return!e;if(i==="__v_isReadonly")return e;if(i==="__v_raw"&&o===(e?t?Zn:Pr:t?Jn:Ir).get(n))return n;let s=$(n);if(!e&&s&&le($e,i))return Reflect.get($e,i,o);let a=Reflect.get(n,i,o);return(ke(i)?kr.has(i):qn(i))||(e||O(n,"get",i),t)?a:Et(a)?!s||!Ie(i)?a.value:a:ue(a)?e?Dr(a):Le(a):a}}var Qn=$r(),Xn=$r(!0);function $r(e=!1){return function(r,n,i,o){let s=r[n];if(!e&&(i=_(i),s=_(s),!$(r)&&Et(s)&&!Et(i)))return s.value=i,!0;let a=$(r)&&Ie(n)?Number(n)<r.length:le(r,n),c=Reflect.set(r,n,i,o);return r===_(o)&&(a?yt(i,s)&&L(r,"set",n,i,s):L(r,"add",n,i)),c}}function ei(e,t){let r=le(e,t),n=e[t],i=Reflect.deleteProperty(e,t);return i&&r&&L(e,"delete",t,void 0,n),i}function ti(e,t){let r=Reflect.has(e,t);return(!ke(t)||!kr.has(t))&&O(e,"has",t),r}function ri(e){return O(e,"iterate",$(e)?"length":U),Reflect.ownKeys(e)}var Lr={get:Un,set:Qn,deleteProperty:ei,has:ti,ownKeys:ri},jr={get:Gn,set(e,t){return console.warn(`Set operation on key "${String(t)}" failed: target is readonly.`,e),!0},deleteProperty(e,t){return console.warn(`Delete operation on key "${String(t)}" failed: target is readonly.`,e),!0}},us=_t({},Lr,{get:Wn,set:Xn}),fs=_t({},jr,{get:Yn}),St=e=>ue(e)?Le(e):e,At=e=>ue(e)?Dr(e):e,Ot=e=>e,je=e=>Reflect.getPrototypeOf(e);function Fe(e,t,r=!1,n=!1){e=e.__v_raw;let i=_(e),o=_(t);t!==o&&!r&&O(i,"get",t),!r&&O(i,"get",o);let{has:s}=je(i),a=n?Ot:r?At:St;if(s.call(i,t))return a(e.get(t));if(s.call(i,o))return a(e.get(o));e!==i&&e.get(t)}function Ke(e,t=!1){let r=this.__v_raw,n=_(r),i=_(e);return e!==i&&!t&&O(n,"has",e),!t&&O(n,"has",i),e===i?r.has(e):r.has(e)||r.has(i)}function Be(e,t=!1){return e=e.__v_raw,!t&&O(_(e),"iterate",U),Reflect.get(e,"size",e)}function Fr(e){e=_(e);let t=_(this);return je(t).has.call(t,e)||(t.add(e),L(t,"add",e,e)),this}function Br(e,t){t=_(t);let r=_(this),{has:n,get:i}=je(r),o=n.call(r,e);o?Kr(r,n,e):(e=_(e),o=n.call(r,e));let s=i.call(r,e);return r.set(e,t),o?yt(t,s)&&L(r,"set",e,t,s):L(r,"add",e,t),this}function zr(e){let t=_(this),{has:r,get:n}=je(t),i=r.call(t,e);i?Kr(t,r,e):(e=_(e),i=r.call(t,e));let o=n?n.call(t,e):void 0,s=t.delete(e);return i&&L(t,"delete",e,void 0,o),s}function Vr(){let e=_(this),t=e.size!==0,r=X(e)?new Map(e):new Set(e),n=e.clear();return t&&L(e,"clear",void 0,void 0,r),n}function ze(e,t){return function(n,i){let o=this,s=o.__v_raw,a=_(s),c=t?Ot:e?At:St;return!e&&O(a,"iterate",U),s.forEach((l,u)=>n.call(i,c(l),c(u),o))}}function Ve(e,t,r){return function(...n){let i=this.__v_raw,o=_(i),s=X(o),a=e==="entries"||e===Symbol.iterator&&s,c=e==="keys"&&s,l=i[e](...n),u=r?Ot:t?At:St;return!t&&O(o,"iterate",c?vt:U),{next(){let{value:d,done:x}=l.next();return x?{value:d,done:x}:{value:a?[u(d[0]),u(d[1])]:u(d),done:x}},[Symbol.iterator](){return this}}}}function j(e){return function(...t){{let r=t[0]?`on key "${t[0]}" `:"";console.warn(`${xt(e)} operation ${r}failed: target is readonly.`,_(this))}return e==="delete"?!1:this}}var Hr={get(e){return Fe(this,e)},get size(){return Be(this)},has:Ke,add:Fr,set:Br,delete:zr,clear:Vr,forEach:ze(!1,!1)},qr={get(e){return Fe(this,e,!1,!0)},get size(){return Be(this)},has:Ke,add:Fr,set:Br,delete:zr,clear:Vr,forEach:ze(!1,!0)},Ur={get(e){return Fe(this,e,!0)},get size(){return Be(this,!0)},has(e){return Ke.call(this,e,!0)},add:j("add"),set:j("set"),delete:j("delete"),clear:j("clear"),forEach:ze(!0,!1)},Wr={get(e){return Fe(this,e,!0,!0)},get size(){return Be(this,!0)},has(e){return Ke.call(this,e,!0)},add:j("add"),set:j("set"),delete:j("delete"),clear:j("clear"),forEach:ze(!0,!0)},ni=["keys","values","entries",Symbol.iterator];ni.forEach(e=>{Hr[e]=Ve(e,!1,!1),Ur[e]=Ve(e,!0,!1),qr[e]=Ve(e,!1,!0),Wr[e]=Ve(e,!0,!0)});function He(e,t){let r=t?e?Wr:qr:e?Ur:Hr;return(n,i,o)=>i==="__v_isReactive"?!e:i==="__v_isReadonly"?e:i==="__v_raw"?n:Reflect.get(le(r,i)&&i in n?r:n,i,o)}var ii={get:He(!1,!1)},ds={get:He(!1,!0)},oi={get:He(!0,!1)},ps={get:He(!0,!0)};function Kr(e,t,r){let n=_(r);if(n!==r&&t.call(e,n)){let i=gt(e);console.warn(`Reactive ${i} contains both the raw and reactive versions of the same object${i==="Map"?" as keys":""}, which can lead to inconsistencies. Avoid differentiating between the raw and reactive versions of an object and only use the reactive version if possible.`)}}var Ir=new WeakMap,Jn=new WeakMap,Pr=new WeakMap,Zn=new WeakMap;function si(e){switch(e){case"Object":case"Array":return 1;case"Map":case"Set":case"WeakMap":case"WeakSet":return 2;default:return 0}}function ai(e){return e.__v_skip||!Object.isExtensible(e)?0:si(gt(e))}function Le(e){return e&&e.__v_isReadonly?e:Gr(e,!1,Lr,ii,Ir)}function Dr(e){return Gr(e,!0,jr,oi,Pr)}function Gr(e,t,r,n,i){if(!ue(e))return console.warn(`value cannot be made reactive: ${String(e)}`),e;if(e.__v_raw&&!(t&&e.__v_isReactive))return e;let o=i.get(e);if(o)return o;let s=ai(e);if(s===0)return e;let a=new Proxy(e,s===2?n:r);return i.set(e,a),a}function _(e){return e&&_(e.__v_raw)||e}function Et(e){return Boolean(e&&e.__v_isRef===!0)}y("nextTick",()=>Oe);y("dispatch",e=>B.bind(B,e));y("watch",(e,{evaluateLater:t,effect:r})=>(n,i)=>{let o=t(n),s=!0,a;r(()=>o(c=>{JSON.stringify(c),s?a=c:queueMicrotask(()=>{i(c,a),a=c}),s=!1}))});y("store",yr);y("data",e=>xe(e));y("root",e=>V(e));y("refs",e=>(e._x_refs_proxy||(e._x_refs_proxy=I(ci(e))),e._x_refs_proxy));function ci(e){let t=[],r=e;for(;r;)r._x_refs&&t.push(r._x_refs),r=r.parentNode;return t}var Tt={};function Ct(e){return Tt[e]||(Tt[e]=0),++Tt[e]}function Yr(e,t){return Q(e,r=>{if(r._x_ids&&r._x_ids[t])return!0})}function Jr(e,t){e._x_ids||(e._x_ids={}),e._x_ids[t]||(e._x_ids[t]=Ct(t))}y("id",e=>(t,r=null)=>{let n=Yr(e,t),i=n?n._x_ids[t]:Ct(t);return r?`${t}-${i}-${r}`:`${t}-${i}`});y("el",e=>e);p("modelable",(e,{expression:t},{effect:r,evaluate:n,evaluateLater:i})=>{let o=i(t),s=()=>{let u;return o(d=>u=d),u},a=i(`${t} = __placeholder`),c=u=>a(()=>{},{scope:{__placeholder:u}}),l=s();e._x_modelable_hook&&(l=e._x_modelable_hook(l)),c(l),queueMicrotask(()=>{if(!e._x_model)return;let u=e._x_model.get,d=e._x_model.set;r(()=>c(u())),r(()=>d(s()))})});p("teleport",(e,{expression:t},{cleanup:r})=>{e.tagName.toLowerCase()!=="template"&&z("x-teleport can only be used on a <template> tag",e);let n=document.querySelector(t);n||z(`Cannot find x-teleport element for selector: "${t}"`);let i=e.content.cloneNode(!0).firstElementChild;e._x_teleport=i,i._x_teleportBack=e,e._x_forwardEvents&&e._x_forwardEvents.forEach(o=>{i.addEventListener(o,s=>{s.stopPropagation(),e.dispatchEvent(new s.constructor(s.type,s))})}),T(i,{},e),m(()=>{n.appendChild(i),E(i),i._x_ignore=!0}),r(()=>i.remove())});var Zr=()=>{};Zr.inline=(e,{modifiers:t},{cleanup:r})=>{t.includes("self")?e._x_ignoreSelf=!0:e._x_ignore=!0,r(()=>{t.includes("self")?delete e._x_ignoreSelf:delete e._x_ignore})};p("ignore",Zr);p("effect",(e,{expression:t},{effect:r})=>r(g(e,t)));function de(e,t,r,n){let i=e,o=c=>n(c),s={},a=(c,l)=>u=>l(c,u);if(r.includes("dot")&&(t=li(t)),r.includes("camel")&&(t=ui(t)),r.includes("passive")&&(s.passive=!0),r.includes("capture")&&(s.capture=!0),r.includes("window")&&(i=window),r.includes("document")&&(i=document),r.includes("prevent")&&(o=a(o,(c,l)=>{l.preventDefault(),c(l)})),r.includes("stop")&&(o=a(o,(c,l)=>{l.stopPropagation(),c(l)})),r.includes("self")&&(o=a(o,(c,l)=>{l.target===e&&c(l)})),(r.includes("away")||r.includes("outside"))&&(i=document,o=a(o,(c,l)=>{e.contains(l.target)||e.offsetWidth<1&&e.offsetHeight<1||e._x_isShown!==!1&&c(l)})),o=a(o,(c,l)=>{fi(t)&&di(l,r)||c(l)}),r.includes("debounce")){let c=r[r.indexOf("debounce")+1]||"invalid-wait",l=Rt(c.split("ms")[0])?Number(c.split("ms")[0]):250;o=Me(o,l)}if(r.includes("throttle")){let c=r[r.indexOf("throttle")+1]||"invalid-wait",l=Rt(c.split("ms")[0])?Number(c.split("ms")[0]):250;o=Ne(o,l)}return r.includes("once")&&(o=a(o,(c,l)=>{c(l),i.removeEventListener(t,o,s)})),i.addEventListener(t,o,s),()=>{i.removeEventListener(t,o,s)}}function li(e){return e.replace(/-/g,".")}function ui(e){return e.toLowerCase().replace(/-(\w)/g,(t,r)=>r.toUpperCase())}function Rt(e){return!Array.isArray(e)&&!isNaN(e)}function pi(e){return e.replace(/([a-z])([A-Z])/g,"$1-$2").replace(/[_\s]/,"-").toLowerCase()}function fi(e){return["keydown","keyup"].includes(e)}function di(e,t){let r=t.filter(o=>!["window","document","prevent","stop","once"].includes(o));if(r.includes("debounce")){let o=r.indexOf("debounce");r.splice(o,Rt((r[o+1]||"invalid-wait").split("ms")[0])?2:1)}if(r.length===0||r.length===1&&Qr(e.key).includes(r[0]))return!1;let i=["ctrl","shift","alt","meta","cmd","super"].filter(o=>r.includes(o));return r=r.filter(o=>!i.includes(o)),!(i.length>0&&i.filter(s=>((s==="cmd"||s==="super")&&(s="meta"),e[`${s}Key`])).length===i.length&&Qr(e.key).includes(r[0]))}function Qr(e){if(!e)return[];e=pi(e);let t={ctrl:"control",slash:"/",space:"-",spacebar:"-",cmd:"meta",esc:"escape",up:"arrow-up",down:"arrow-down",left:"arrow-left",right:"arrow-right",period:".",equal:"="};return t[e]=e,Object.keys(t).map(r=>{if(t[r]===e)return r}).filter(r=>r)}p("model",(e,{modifiers:t,expression:r},{effect:n,cleanup:i})=>{let o=g(e,r),s=`${r} = rightSideOfExpression($event, ${r})`,a=g(e,s);var c=e.tagName.toLowerCase()==="select"||["checkbox","radio"].includes(e.type)||t.includes("lazy")?"change":"input";let l=mi(e,t,r),u=de(e,c,t,x=>{a(()=>{},{scope:{$event:x,rightSideOfExpression:l}})});i(()=>u());let d=g(e,`${r} = __placeholder`);e._x_model={get(){let x;return o(M=>x=M),x},set(x){d(()=>{},{scope:{__placeholder:x}})}},e._x_forceModelUpdate=()=>{o(x=>{x===void 0&&r.match(/\./)&&(x=""),window.fromModel=!0,m(()=>ce(e,"value",x)),delete window.fromModel})},n(()=>{t.includes("unintrusive")&&document.activeElement.isSameNode(e)||e._x_forceModelUpdate()})});function mi(e,t,r){return e.type==="radio"&&m(()=>{e.hasAttribute("name")||e.setAttribute("name",r)}),(n,i)=>m(()=>{if(n instanceof CustomEvent&&n.detail!==void 0)return n.detail||n.target.value;if(e.type==="checkbox")if(Array.isArray(i)){let o=t.includes("number")?Mt(n.target.value):n.target.value;return n.target.checked?i.concat([o]):i.filter(s=>!hi(s,o))}else return n.target.checked;else{if(e.tagName.toLowerCase()==="select"&&e.multiple)return t.includes("number")?Array.from(n.target.selectedOptions).map(o=>{let s=o.value||o.text;return Mt(s)}):Array.from(n.target.selectedOptions).map(o=>o.value||o.text);{let o=n.target.value;return t.includes("number")?Mt(o):t.includes("trim")?o.trim():o}}})}function Mt(e){let t=e?parseFloat(e):null;return _i(t)?t:e}function hi(e,t){return e==t}function _i(e){return!Array.isArray(e)&&!isNaN(e)}p("cloak",e=>queueMicrotask(()=>m(()=>e.removeAttribute(w("cloak")))));Ce(()=>`[${w("init")}]`);p("init",D((e,{expression:t},{evaluate:r})=>typeof t=="string"?!!t.trim()&&r(t,{},!1):r(t,{},!1)));p("text",(e,{expression:t},{effect:r,evaluateLater:n})=>{let i=n(t);r(()=>{i(o=>{m(()=>{e.textContent=o})})})});p("html",(e,{expression:t},{effect:r,evaluateLater:n})=>{let i=n(t);r(()=>{i(o=>{e.innerHTML=o})})});Z(we(":",Ee(w("bind:"))));p("bind",(e,{value:t,modifiers:r,expression:n,original:i},{effect:o})=>{if(!t)return gi(e,n,i,o);if(t==="key")return xi(e,n);let s=g(e,n);o(()=>s(a=>{a===void 0&&n.match(/\./)&&(a=""),m(()=>ce(e,t,a,r))}))});function gi(e,t,r,n){let i={};wr(i);let o=g(e,t),s=[];for(;s.length;)s.pop()();o(a=>{let c=Object.entries(a).map(([u,d])=>({name:u,value:d})),l=Qt(c);c=c.map(u=>l.find(d=>d.name===u.name)?{name:`x-bind:${u.name}`,value:`"${u.value}"`}:u),ne(e,c,r).map(u=>{s.push(u.runCleanups),u()})},{scope:i})}function xi(e,t){e._x_keyExpression=t}Te(()=>`[${w("data")}]`);p("data",D((e,{expression:t},{cleanup:r})=>{t=t===""?"{}":t;let n={};re(n,e);let i={};Ar(i,n);let o=N(e,t,{scope:i});o===void 0&&(o={}),re(o,e);let s=A(o);ye(s);let a=T(e,s);s.init&&N(e,s.init),r(()=>{a(),s.destroy&&N(e,s.destroy)})}));p("show",(e,{modifiers:t,expression:r},{effect:n})=>{let i=g(e,r),o=()=>m(()=>{e.style.display="none",e._x_isShown=!1}),s=()=>m(()=>{e.style.length===1&&e.style.display==="none"?e.removeAttribute("style"):e.style.removeProperty("display"),e._x_isShown=!0}),a=()=>setTimeout(s),c=se(d=>d?s():o(),d=>{typeof e._x_toggleAndCascadeWithTransitions=="function"?e._x_toggleAndCascadeWithTransitions(e,d,s,o):d?a():o()}),l,u=!0;n(()=>i(d=>{!u&&d===l||(t.includes("immediate")&&(d?a():o()),c(d),l=d,u=!1)}))});p("for",(e,{expression:t},{effect:r,cleanup:n})=>{let i=bi(t),o=g(e,i.items),s=g(e,e._x_keyExpression||"index");e._x_prevKeys=[],e._x_lookup={},r(()=>yi(e,i,o,s)),n(()=>{Object.values(e._x_lookup).forEach(a=>a.remove()),delete e._x_prevKeys,delete e._x_lookup})});function yi(e,t,r,n){let i=s=>typeof s=="object"&&!Array.isArray(s),o=e;r(s=>{vi(s)&&s>=0&&(s=Array.from(Array(s).keys(),f=>f+1)),s===void 0&&(s=[]);let a=e._x_lookup,c=e._x_prevKeys,l=[],u=[];if(i(s))s=Object.entries(s).map(([f,h])=>{let b=Xr(t,h,f,s);n(v=>u.push(v),{scope:{index:f,...b}}),l.push(b)});else for(let f=0;f<s.length;f++){let h=Xr(t,s[f],f,s);n(b=>u.push(b),{scope:{index:f,...h}}),l.push(h)}let d=[],x=[],M=[],W=[];for(let f=0;f<c.length;f++){let h=c[f];u.indexOf(h)===-1&&M.push(h)}c=c.filter(f=>!M.includes(f));let pe="template";for(let f=0;f<u.length;f++){let h=u[f],b=c.indexOf(h);if(b===-1)c.splice(f,0,h),d.push([pe,f]);else if(b!==f){let v=c.splice(f,1)[0],S=c.splice(b-1,1)[0];c.splice(f,0,S),c.splice(b,0,v),x.push([v,S])}else W.push(h);pe=h}for(let f=0;f<M.length;f++){let h=M[f];a[h]._x_effects&&a[h]._x_effects.forEach(he),a[h].remove(),a[h]=null,delete a[h]}for(let f=0;f<x.length;f++){let[h,b]=x[f],v=a[h],S=a[b],G=document.createElement("div");m(()=>{S.after(G),v.after(S),S._x_currentIfEl&&S.after(S._x_currentIfEl),G.before(v),v._x_currentIfEl&&v.after(v._x_currentIfEl),G.remove()}),nt(S,l[u.indexOf(b)])}for(let f=0;f<d.length;f++){let[h,b]=d[f],v=h==="template"?o:a[h];v._x_currentIfEl&&(v=v._x_currentIfEl);let S=l[b],G=u[b],me=document.importNode(o.content,!0).firstElementChild;T(me,A(S),o),m(()=>{v.after(me),E(me)}),typeof G=="object"&&z("x-for key cannot be an object, it must be a string or an integer",o),a[G]=me}for(let f=0;f<W.length;f++)nt(a[W[f]],l[u.indexOf(W[f])]);o._x_prevKeys=u})}function bi(e){let t=/,([^,\}\]]*)(?:,([^,\}\]]*))?$/,r=/^\s*\(|\)\s*$/g,n=/([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/,i=e.match(n);if(!i)return;let o={};o.items=i[2].trim();let s=i[1].replace(r,"").trim(),a=s.match(t);return a?(o.item=s.replace(t,"").trim(),o.index=a[1].trim(),a[2]&&(o.collection=a[2].trim())):o.item=s,o}function Xr(e,t,r,n){let i={};return/^\[.*\]$/.test(e.item)&&Array.isArray(t)?e.item.replace("[","").replace("]","").split(",").map(s=>s.trim()).forEach((s,a)=>{i[s]=t[a]}):/^\{.*\}$/.test(e.item)&&!Array.isArray(t)&&typeof t=="object"?e.item.replace("{","").replace("}","").split(",").map(s=>s.trim()).forEach(s=>{i[s]=t[s]}):i[e.item]=t,e.index&&(i[e.index]=r),e.collection&&(i[e.collection]=n),i}function vi(e){return!Array.isArray(e)&&!isNaN(e)}function en(){}en.inline=(e,{expression:t},{cleanup:r})=>{let n=V(e);n._x_refs||(n._x_refs={}),n._x_refs[t]=e,r(()=>delete n._x_refs[t])};p("ref",en);p("if",(e,{expression:t},{effect:r,cleanup:n})=>{let i=g(e,t),o=()=>{if(e._x_currentIfEl)return e._x_currentIfEl;let a=e.content.cloneNode(!0).firstElementChild;return T(a,{},e),m(()=>{e.after(a),E(a)}),e._x_currentIfEl=a,e._x_undoIf=()=>{C(a,c=>{c._x_effects&&c._x_effects.forEach(he)}),a.remove(),delete e._x_currentIfEl},a},s=()=>{!e._x_undoIf||(e._x_undoIf(),delete e._x_undoIf)};r(()=>i(a=>{a?o():s()})),n(()=>e._x_undoIf&&e._x_undoIf())});p("id",(e,{expression:t},{evaluate:r})=>{r(t).forEach(i=>Jr(e,i))});Z(we("@",Ee(w("on:"))));p("on",D((e,{value:t,modifiers:r,expression:n},{cleanup:i})=>{let o=n?g(e,n):()=>{};e.tagName.toLowerCase()==="template"&&(e._x_forwardEvents||(e._x_forwardEvents=[]),e._x_forwardEvents.includes(t)||e._x_forwardEvents.push(t));let s=de(e,t,r,a=>{o(()=>{},{scope:{$event:a},params:[a]})});i(()=>s())}));P.setEvaluator(st);P.setReactivityEngine({reactive:Le,effect:Cr,release:Mr,raw:_});var Nt=P;window.Alpine=Nt;queueMicrotask(()=>{Nt.start()});})();
diff --git a/book-database.php b/book-database.php
index e16589d0..2e2c3064 100644
--- a/book-database.php
+++ b/book-database.php
@@ -3,7 +3,7 @@
  * Plugin Name: Book Database
  * Plugin URI: https://shop.nosegraze.com/product/book-database/
  * Description: Maintain a database of books and reviews.
- * Version: 1.2.2
+ * Version: 1.3
  * Author: Ashley Gibson
  * Author URI: http://www.nosegraze.com
  * License: GPL2 License
@@ -31,605 +31,82 @@
 
 namespace Book_Database;
 
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+if (! defined('BDB_VERSION')) {
+    define('BDB_VERSION', '1.3');
 }
-
-if ( ! defined( 'BDB_VERSION' ) ) {
-	define( 'BDB_VERSION', '1.2.2' );
-}
-if ( ! defined( 'BDB_DIR' ) ) {
-	define( 'BDB_DIR', plugin_dir_path( __FILE__ ) );
+if (! defined('BDB_DIR')) {
+    define('BDB_DIR', plugin_dir_path(__FILE__));
 }
-if ( ! defined( 'BDB_URL' ) ) {
-	define( 'BDB_URL', plugin_dir_url( __FILE__ ) );
+if (! defined('BDB_URL')) {
+    define('BDB_URL', plugin_dir_url(__FILE__));
 }
-if ( ! defined( 'BDB_FILE' ) ) {
-	define( 'BDB_FILE', __FILE__ );
+if (! defined('BDB_FILE')) {
+    define('BDB_FILE', __FILE__);
 }
-if ( ! defined( 'NOSE_GRAZE_STORE_URL' ) ) {
-	define( 'NOSE_GRAZE_STORE_URL', 'https://shop.nosegraze.com' );
-}
-
-/**
- * Class Book_Database
- *
- * @package Book_Database
- */
-final class Book_Database {
-
-	/**
-	 * Instance of the Book_Database class.
-	 *
-	 * @var Book_Database
-	 */
-	private static $instance;
-
-	/**
-	 * Array of custom table objects
-	 *
-	 * @var array
-	 */
-	private $tables = array();
-
-	/**
-	 * @var REST_API
-	 */
-	private $rest_api;
-
-	/**
-	 * @var HTML
-	 */
-	private $html;
-
-	/**
-	 * Book_Database instance.
-	 *
-	 * @return Book_Database Instance of Book_Database class
-	 */
-	public static function instance() {
-
-		// Return if already instantiated
-		if ( self::is_instantiated() ) {
-			return self::$instance;
-		}
-
-		// Set up the singleton.
-		self::setup_instance();
-
-		// Bootstrap
-		self::$instance->setup_files();
-		self::$instance->setup_application();
-
-		add_action( 'admin_init', array( self::$instance, 'install' ), 11 );
-
-		return self::$instance;
-
-	}
-
-	/**
-	 * Whether the main class has been instantiated or not.
-	 *
-	 * @return bool
-	 */
-	private static function is_instantiated() {
-
-		// Return true if instance is correct class
-		if ( ! empty( self::$instance ) && ( self::$instance instanceof Book_Database ) ) {
-			return true;
-		}
-
-		// Return false if not instantiated correctly
-		return false;
-
-	}
-
-	/**
-	 * Set up the singleton instance
-	 */
-	private static function setup_instance() {
-		self::$instance = new Book_Database();
-	}
-
-	/**
-	 * Include required files.
-	 *
-	 * @return void
-	 */
-	private function setup_files() {
-		$this->include_files();
-
-		// Admin
-		if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
-			$this->include_admin();
-		} else {
-			$this->include_frontend();
-		}
-	}
-
-	/**
-	 * Include global files
-	 */
-	private function include_files() {
-
-		require_once BDB_DIR . 'includes/abstract-class-base-object.php';
-		require_once BDB_DIR . 'includes/class-exception.php';
-
-		// Database engine
-		require_once BDB_DIR . 'includes/database/engine/base.php';
-		require_once BDB_DIR . 'includes/database/engine/table.php';
-		require_once BDB_DIR . 'includes/database/engine/query.php';
-		require_once BDB_DIR . 'includes/database/engine/column.php';
-		require_once BDB_DIR . 'includes/database/engine/row.php';
-		require_once BDB_DIR . 'includes/database/engine/schema.php';
-		require_once BDB_DIR . 'includes/database/engine/compare.php';
-		require_once BDB_DIR . 'includes/database/engine/date.php';
-		require_once BDB_DIR . 'includes/database/engine/series.php';
-		require_once BDB_DIR . 'includes/database/engine/tax.php';
-		require_once BDB_DIR . 'includes/database/engine/author.php';
-		require_once BDB_DIR . 'includes/database/engine/join.php';
-		require_once BDB_DIR . 'includes/database/engine/book.php';
-		require_once BDB_DIR . 'includes/database/engine/edition.php';
-		require_once BDB_DIR . 'includes/database/engine/reading-log.php';
-		require_once BDB_DIR . 'includes/database/engine/class-where-clause.php';
-		require_once BDB_DIR . 'includes/database/sanitization.php';
-
-		// Database - authors
-		require_once BDB_DIR . 'includes/database/authors/class-authors-table.php';
-		require_once BDB_DIR . 'includes/database/authors/class-authors-schema.php';
-		require_once BDB_DIR . 'includes/database/authors/class-authors-query.php';
-
-		// Database - book_author_relationships
-		require_once BDB_DIR . 'includes/database/book-author-relationships/class-book-author-relationships-table.php';
-		require_once BDB_DIR . 'includes/database/book-author-relationships/class-book-author-relationships-schema.php';
-		require_once BDB_DIR . 'includes/database/book-author-relationships/class-book-author-relationships-query.php';
-
-		// Database - books
-		require_once BDB_DIR . 'includes/database/books/class-books-table.php';
-		require_once BDB_DIR . 'includes/database/books/class-books-schema.php';
-		require_once BDB_DIR . 'includes/database/books/class-books-query.php';
-		require_once BDB_DIR . 'includes/database/books/class-book-meta-table.php';
-
-		// Database - book_links
-		require_once BDB_DIR . 'includes/database/book-links/class-book-links-table.php';
-		require_once BDB_DIR . 'includes/database/book-links/class-book-links-schema.php';
-		require_once BDB_DIR . 'includes/database/book-links/class-book-links-query.php';
-
-		// Database - book_taxonomies
-		require_once BDB_DIR . 'includes/database/book-taxonomies/class-book-taxonomies-table.php';
-		require_once BDB_DIR . 'includes/database/book-taxonomies/class-book-taxonomies-schema.php';
-		require_once BDB_DIR . 'includes/database/book-taxonomies/class-book-taxonomies-query.php';
-
-		// Database - book_term_relationships
-		require_once BDB_DIR . 'includes/database/book-term-relationships/class-book-term-relationships-table.php';
-		require_once BDB_DIR . 'includes/database/book-term-relationships/class-book-term-relationships-schema.php';
-		require_once BDB_DIR . 'includes/database/book-term-relationships/class-book-term-relationships-query.php';
-
-		// Database - book_terms
-		require_once BDB_DIR . 'includes/database/book-terms/class-book-terms-table.php';
-		require_once BDB_DIR . 'includes/database/book-terms/class-book-terms-schema.php';
-		require_once BDB_DIR . 'includes/database/book-terms/class-book-terms-query.php';
-
-		// Database - owned_editions
-		require_once BDB_DIR . 'includes/database/editions/class-editions-table.php';
-		require_once BDB_DIR . 'includes/database/editions/class-editions-schema.php';
-		require_once BDB_DIR . 'includes/database/editions/class-editions-query.php';
-
-		// Database - reading_log
-		require_once BDB_DIR . 'includes/database/reading-logs/class-reading-logs-table.php';
-		require_once BDB_DIR . 'includes/database/reading-logs/class-reading-logs-schema.php';
-		require_once BDB_DIR . 'includes/database/reading-logs/class-reading-logs-query.php';
-
-		// Database - retailers
-		require_once BDB_DIR . 'includes/database/retailers/class-retailers-table.php';
-		require_once BDB_DIR . 'includes/database/retailers/class-retailers-schema.php';
-		require_once BDB_DIR . 'includes/database/retailers/class-retailers-query.php';
-
-		// Database - reviews
-		require_once BDB_DIR . 'includes/database/reviews/class-reviews-table.php';
-		require_once BDB_DIR . 'includes/database/reviews/class-reviews-schema.php';
-		require_once BDB_DIR . 'includes/database/reviews/class-reviews-query.php';
-		require_once BDB_DIR . 'includes/database/reviews/class-review-meta-table.php';
-
-		// Database - series
-		require_once BDB_DIR . 'includes/database/series/class-series-table.php';
-		require_once BDB_DIR . 'includes/database/series/class-series-schema.php';
-		require_once BDB_DIR . 'includes/database/series/class-series-query.php';
-
-		// Analytics
-		require_once BDB_DIR . 'includes/analytics/abstract-class-dataset.php';
-		require_once BDB_DIR . 'includes/analytics/analytics-functions.php';
-		require_once BDB_DIR . 'includes/analytics/graphs/class-graph.php';
-		require_once BDB_DIR . 'includes/analytics/graphs/class-bar-graph.php';
-		require_once BDB_DIR . 'includes/analytics/graphs/class-horizontal-bar-graph.php';
-		require_once BDB_DIR . 'includes/analytics/graphs/class-pie-chart.php';
-		require_once BDB_DIR . 'includes/analytics/graphs/class-scatter-chart.php';
-		$datasets = array(
-			'reading-overview', 'number-different-series-read', 'number-standalones-read', 'pages-read',
-			'number-different-authors-read', 'number-reviews-written', 'average-rating', 'reading-track',
-			'books-per-year', 'most-read-genres', 'pages-breakdown', 'ratings-breakdown', 'highest-rated-books',
-			'lowest-rated-books', 'format-breakdown', 'average-days-finish-book', 'shortest-book-read', 'longest-book-read',
-			'number-editions', 'edition-format-breakdown', 'editions-over-time', 'reviews-over-time', 'reviews-written',
-			'books-read-over-time', 'terms-breakdown', 'number-signed-editions', 'edition-genre-breakdown',
-			'edition-source-breakdown', 'average-days-acquired-to-read', 'number-books-added', 'number-series-books-added',
-			'number-standalones-added', 'number-distinct-authors-added', 'library-genre-breakdown', 'library-book-releases',
-			'books-read-by-publication-year',
-		);
-		foreach ( $datasets as $dataset ) {
-			if ( file_exists( BDB_DIR . 'includes/analytics/datasets/class-' . $dataset . '.php' ) ) {
-				require_once BDB_DIR . 'includes/analytics/datasets/class-' . $dataset . '.php';
-			}
-		}
-
-		// Authors
-		require_once BDB_DIR . 'includes/authors/class-author.php';
-		require_once BDB_DIR . 'includes/authors/author-functions.php';
-
-		// Blocks
-		require_once BDB_DIR . 'includes/blocks.php';
-
-		// Book Author Relationships
-		require_once BDB_DIR . 'includes/book-author-relationships/class-book-author-relationship.php';
-		require_once BDB_DIR . 'includes/book-author-relationships/book-author-relationship-actions.php';
-		require_once BDB_DIR . 'includes/book-author-relationships/book-author-relationship-functions.php';
-
-		// Books
-		require_once BDB_DIR . 'includes/books/class-book.php';
-		require_once BDB_DIR . 'includes/books/class-book-layout.php';
-		require_once BDB_DIR . 'includes/books/book-functions.php';
-		require_once BDB_DIR . 'includes/books/book-layout-functions.php';
-		require_once BDB_DIR . 'includes/books/book-meta.php';
-
-		// Book Links
-		require_once BDB_DIR . 'includes/book-links/class-book-link.php';
-		require_once BDB_DIR . 'includes/book-links/book-link-functions.php';
-
-		// Book Taxonomies
-		require_once BDB_DIR . 'includes/book-taxonomies/class-book-taxonomy.php';
-		require_once BDB_DIR . 'includes/book-taxonomies/book-taxonomy-functions.php';
-
-		// Book Term Relationships
-		require_once BDB_DIR . 'includes/book-term-relationships/class-book-term-relationship.php';
-		require_once BDB_DIR . 'includes/book-term-relationships/book-term-relationship-actions.php';
-		require_once BDB_DIR . 'includes/book-term-relationships/book-term-relationship-functions.php';
-
-		// Book Terms
-		require_once BDB_DIR . 'includes/book-terms/class-book-term.php';
-		require_once BDB_DIR . 'includes/book-terms/book-term-functions.php';
-
-		// Editions
-		require_once BDB_DIR . 'includes/editions/class-edition.php';
-		require_once BDB_DIR . 'includes/editions/edition-functions.php';
-
-		// Ratings
-		require_once BDB_DIR . 'includes/ratings/class-rating.php';
-		require_once BDB_DIR . 'includes/ratings/rating-functions.php';
-
-		// Reading Logs
-		require_once BDB_DIR . 'includes/reading-logs/class-reading-log.php';
-		require_once BDB_DIR . 'includes/reading-logs/reading-log-functions.php';
-
-		// Retailers
-		require_once BDB_DIR . 'includes/retailers/class-retailer.php';
-		require_once BDB_DIR . 'includes/retailers/retailer-functions.php';
-
-		// Reviews
-		require_once BDB_DIR . 'includes/reviews/class-review.php';
-		require_once BDB_DIR . 'includes/reviews/review-actions.php';
-		require_once BDB_DIR . 'includes/reviews/review-functions.php';
-		require_once BDB_DIR . 'includes/reviews/review-meta.php';
-
-		// Series
-		require_once BDB_DIR . 'includes/series/class-series.php';
-		require_once BDB_DIR . 'includes/series/series-functions.php';
-
-		// REST API
-		require_once BDB_DIR . 'includes/rest-api/class-rest-api.php';
-		require_once BDB_DIR . 'includes/rest-api/abstract-class-controller.php';
-		require_once BDB_DIR . 'includes/rest-api/v1/class-analytics-controller.php';
-		require_once BDB_DIR . 'includes/rest-api/v1/class-author-controller.php';
-		require_once BDB_DIR . 'includes/rest-api/v1/class-book-controller.php';
-		require_once BDB_DIR . 'includes/rest-api/v1/class-book-link-controller.php';
-		require_once BDB_DIR . 'includes/rest-api/v1/class-book-term-controller.php';
-		require_once BDB_DIR . 'includes/rest-api/v1/class-edition-controller.php';
-		require_once BDB_DIR . 'includes/rest-api/v1/class-reading-log-controller.php';
-		require_once BDB_DIR . 'includes/rest-api/v1/class-retailer-controller.php';
-		require_once BDB_DIR . 'includes/rest-api/v1/class-review-controller.php';
-		require_once BDB_DIR . 'includes/rest-api/v1/class-series-controller.php';
-		require_once BDB_DIR . 'includes/rest-api/v1/class-taxonomy-controller.php';
-		require_once BDB_DIR . 'includes/rest-api/v1/class-utility-controller.php';
-
-		// Widgets
-		require_once BDB_DIR . 'includes/widgets/Reading_Log.php';
-		require_once BDB_DIR . 'includes/widgets/Reviews.php';
-
-		// Misc.
-		require_once BDB_DIR . 'includes/capabilities.php';
-		require_once BDB_DIR . 'includes/class-analytics.php';
-		require_once BDB_DIR . 'includes/class-book-reviews-query.php';
-		require_once BDB_DIR . 'includes/class-book-grid-query.php';
-		require_once BDB_DIR . 'includes/class-html.php';
-		require_once BDB_DIR . 'includes/misc-functions.php';
-		require_once BDB_DIR . 'includes/rewrites.php';
-		require_once BDB_DIR . 'includes/shortcodes.php';
-		require_once BDB_DIR . 'includes/template-functions.php';
-
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			require_once BDB_DIR . 'includes/class-cli.php';
-		}
-
-	}
-
-	/**
-	 * Include admin files
-	 */
-	private function include_admin() {
-
-		require_once BDB_DIR . 'includes/admin/abstract-class-list-table.php';
-		require_once BDB_DIR . 'includes/admin/admin-assets.php';
-		require_once BDB_DIR . 'includes/admin/admin-bar.php';
-		require_once BDB_DIR . 'includes/admin/admin-notices.php';
-		require_once BDB_DIR . 'includes/admin/admin-pages.php';
-
-		// Analytics
-		require_once BDB_DIR . 'includes/admin/analytics/analytics-page.php';
-		require_once BDB_DIR . 'includes/admin/analytics/tabs/overview.php';
-		require_once BDB_DIR . 'includes/admin/analytics/tabs/library.php';
-		require_once BDB_DIR . 'includes/admin/analytics/tabs/reading.php';
-		require_once BDB_DIR . 'includes/admin/analytics/tabs/ratings.php';
-		require_once BDB_DIR . 'includes/admin/analytics/tabs/editions.php';
-		require_once BDB_DIR . 'includes/admin/analytics/tabs/reviews.php';
-		require_once BDB_DIR . 'includes/admin/analytics/tabs/terms.php';
-
-		// Authors
-		require_once BDB_DIR . 'includes/admin/authors/author-actions.php';
-		require_once BDB_DIR . 'includes/admin/authors/author-functions.php';
-		require_once BDB_DIR . 'includes/admin/authors/authors-page.php';
-
-		// Book Terms
-		require_once BDB_DIR . 'includes/admin/book-terms/book-term-actions.php';
-		require_once BDB_DIR . 'includes/admin/book-terms/book-term-functions.php';
-		require_once BDB_DIR . 'includes/admin/book-terms/book-terms-page.php';
-
-		// Books
-		require_once BDB_DIR . 'includes/admin/books/book-actions.php';
-		require_once BDB_DIR . 'includes/admin/books/book-functions.php';
-		require_once BDB_DIR . 'includes/admin/books/books-page.php';
-		require_once BDB_DIR . 'includes/admin/books/edit-book-fields.php';
-
-		// Dashboard
-		require_once BDB_DIR . 'includes/admin/dashboard/widgets.php';
-
-		// Editions
-		require_once BDB_DIR . 'includes/admin/editions/edition-actions.php';
-
-		// Licensing
-		require_once BDB_DIR . 'vendor/class-edd-sl-plugin-updater.php';
-		require_once BDB_DIR . 'includes/admin/licensing/class-license-key.php';
-		require_once BDB_DIR . 'includes/admin/licensing/license-actions.php';
-
-		// Posts
-		require_once BDB_DIR . 'includes/admin/posts/post-actions.php';
-
-		// Reading Logs
-		require_once BDB_DIR . 'includes/admin/reading-logs/reading-log-actions.php';
-
-		// Reviews
-		require_once BDB_DIR . 'includes/admin/reviews/review-actions.php';
-		require_once BDB_DIR . 'includes/admin/reviews/review-fields.php';
-		require_once BDB_DIR . 'includes/admin/reviews/review-functions.php';
-		require_once BDB_DIR . 'includes/admin/reviews/reviews-page.php';
-
-		// Series
-		require_once BDB_DIR . 'includes/admin/series/series-actions.php';
-		require_once BDB_DIR . 'includes/admin/series/series-functions.php';
-		require_once BDB_DIR . 'includes/admin/series/series-page.php';
-
-		// Settings
-		require_once BDB_DIR . 'includes/admin/settings/book-layout-functions.php';
-		require_once BDB_DIR . 'includes/admin/settings/register-settings.php';
-		require_once BDB_DIR . 'includes/admin/settings/display-settings.php';
-
-	}
-
-	/**
-	 * Include front-end files
-	 */
-	private function include_frontend() {
-		require_once BDB_DIR . 'includes/assets.php';
-	}
-
-	/**
-	 * Set up custom database tables
-	 */
-	private function setup_application() {
-
-		self::$instance->tables = array(
-			'authors'                   => new Authors_Table(),
-			'book_author_relationships' => new Book_Author_Relationships_Table(),
-			'book_links'                => new Book_Links_Table(),
-			'book_taxonomies'           => new Book_Taxonomies_Table(),
-			'book_term_relationships'   => new Book_Term_Relationships_Table(),
-			'book_terms'                => new Book_Terms_Table(),
-			'books'                     => new Books_Table(),
-			'book_meta'                 => new Book_Meta_Table(),
-			'editions'                  => new Editions_Table(),
-			'reading_log'               => new Reading_Logs_Table(),
-			'retailers'                 => new Retailers_Table(),
-			'reviews'                   => new Reviews_Table(),
-			'review_meta'               => new Review_Meta_Table(),
-			'series'                    => new Series_Table(),
-		);
-
-		self::$instance->rest_api = new REST_API();
-		self::$instance->html     = new HTML();
-
-	}
-
-	/**
-	 * Get a table object by its key
-	 *
-	 * @param string $table_key Table key.  One of:
-	 *                          'authors',
-	 *                          'book_author_relationships',
-	 *                          'book_links',
-	 *                          'book_taxonomies',
-	 *                          'book_term_relationships',
-	 *                          'book_terms'
-	 *                          'books'
-	 *                          'book_meta',
-	 *                          'editions'
-	 *                          'reading_log'
-	 *                          'retailers',
-	 *                          'reviews',
-	 *                          'review_meta',
-	 *                          'series'
-	 *
-	 * @return BerlinDB\Database\Table|false
-	 */
-	public function get_table( $table_key ) {
-		return array_key_exists( $table_key, self::$instance->tables ) ? self::$instance->tables[ $table_key ] : false;
-	}
-
-	/**
-	 * Returns an array of all registered tables
-	 *
-	 * @return BerlinDB\Database\Table[]
-	 */
-	public function get_tables() {
-		return self::$instance->tables;
-	}
-
-	/**
-	 * Get the HTML helper class
-	 *
-	 * @return HTML
-	 */
-	public function get_html() {
-		return $this->html;
-	}
-
-	/**
-	 * Run installation
-	 *
-	 *      - Install default taxonomies.
-	 *      - Add rewrite tags/rules and flush
-	 */
-	public function install() {
-
-		if ( ! get_option( 'bdb_run_activation' ) ) {
-			return;
-		}
-
-		/**
-		 * Add default taxonomies.
-		 */
-		if ( ! $this->get_table( 'book_taxonomies' )->exists() ) {
-			$this->get_table( 'book_taxonomies' )->install();
-		}
-
-		$default_taxonomies = array(
-			'publisher' => array(
-				'slug'   => 'publisher',
-				'name'   => esc_html__( 'Publisher', 'book-database' ),
-				'format' => 'text' // text, checkbox
-			),
-			'genre'     => array(
-				'slug'   => 'genre',
-				'name'   => esc_html__( 'Genre', 'book-database' ),
-				'format' => 'text'
-			),
-			'source'    => array(
-				'slug'   => 'source',
-				'name'   => esc_html__( 'Source', 'book-database' ),
-				'format' => 'checkbox'
-			)
-		);
-
-		foreach ( $default_taxonomies as $taxonomy ) {
-			if ( get_book_taxonomy_by( 'slug', $taxonomy['slug'] ) ) {
-				continue;
-			}
-
-			try {
-				add_book_taxonomy( $taxonomy );
-			} catch ( Exception $e ) {
-
-			}
-		}
-
-		/**
-		 * Add rewrite tags/rules and flush
-		 */
-		add_rewrite_tags();
-		add_rewrite_rules();
-		flush_rewrite_rules( true );
-
-		/**
-		 * Add capabilities
-		 */
-		$role = get_role( 'administrator' );
-
-		foreach ( get_book_capabilities() as $capability ) {
-			$role->add_cap( $capability, true );
-		}
-
-		/**
-		 * Set version number
-		 */
-		update_option( 'bdb_version', BDB_VERSION );
-
-		if ( ! get_option( 'bdb_install_date' ) ) {
-			update_option( 'bdb_install_date', date( 'Y-m-d H:i:s' ), false );
-		}
-
-		delete_option( 'bdb_run_activation' );
-
-	}
-
+if (! defined('NOSE_GRAZE_STORE_URL')) {
+    define('NOSE_GRAZE_STORE_URL', 'https://shop.nosegraze.com');
 }
 
-
 /**
- * Require PHP 7.0+
+ * Require PHP 7.1+
  */
 /**
  * Insufficient PHP version notice.
  *
  * @return void
  */
-function insufficient_php_version() {
-	?>
-	<div class="notice notice-error">
-		<p><?php printf( __( 'Book Database requires PHP version 7.0 or greater. You have version %s. Please contact your web host to upgrade your version of PHP.', 'book-database' ), PHP_VERSION ); ?></p>
-	</div>
-	<?php
+function insufficient_php_version()
+{
+    ?>
+    <div class="notice notice-error">
+        <p>
+            <?php
+            printf(
+                __(
+                    'Book Database requires PHP version 7.1 or greater. You have version %s. Please contact your web host to upgrade your version of PHP.',
+                    'book-database'
+                ),
+                PHP_VERSION
+            );
+            ?>
+        </p>
+    </div>
+    <?php
 }
 
 /**
  * Returns the main instance of Book_Database.
  *
- * @return Book_Database|void
+ * @return Plugin
  */
-function book_database() {
-	if ( version_compare( PHP_VERSION, '7.0', '>=' ) ) {
-		return Book_Database::instance();
-	} else {
-		add_action( 'admin_notices', __NAMESPACE__ . '\insufficient_php_version' );
-	}
+function book_database($abstract = null)
+{
+    $instance = Plugin::instance();
+
+    if ($abstract !== null) {
+        return $instance->make($abstract);
+    }
+
+    return $instance;
 }
 
-add_action( 'plugins_loaded', __NAMESPACE__ . '\book_database', 4 );
+if (version_compare(PHP_VERSION, '7.1', '>=')) {
+    require_once BDB_DIR.'vendor/autoload.php';
+    book_database();
+} else {
+    add_action('admin_notices', __NAMESPACE__.'\insufficient_php_version');
+}
 
 /**
  * On activation, create an option. We'll use this as a flag to actually run our activation later.
  *
- * @see   Book_Database::install()
+ * @see   Plugin::install()
  *
  * @since 1.0
  */
-function activate() {
-	add_option( 'bdb_run_activation', date( 'Y-m-d H:i:s' ) );
+function activate()
+{
+    add_option('bdb_run_activation', date('Y-m-d H:i:s'));
 }
 
-register_activation_hook( __FILE__, __NAMESPACE__ . '\activate' );
+register_activation_hook(__FILE__, __NAMESPACE__.'\activate');
diff --git a/composer.json b/composer.json
index b477bf54..7dbf6d2a 100644
--- a/composer.json
+++ b/composer.json
@@ -3,11 +3,18 @@
   "type": "wordpress-plugin",
   "license": "GPL-2.0-or-later",
   "description": "Maintain a database of books and reviews.",
+  "autoload": {
+    "psr-4": {
+      "Book_Database\\": "src/"
+    }
+  },
   "require": {
-    "php": "^7.0|^8.0"
+    "php": "^7.1|^8.0",
+    "ashleyfae/contextwp-sdk": "dev-main"
   },
   "require-dev": {
     "phpunit/phpunit": "9.5.10",
     "yoast/phpunit-polyfills": "1.x-dev"
-  }
+  },
+  "minimum-stability": "dev"
 }
diff --git a/composer.lock b/composer.lock
index 894a7820..f9a989aa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,84 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "62011a912846b8d801325533e50d5fdb",
-    "packages": [],
+    "content-hash": "fa5c9b1f33bf99dbf40c0325107a10ae",
+    "packages": [
+        {
+            "name": "ashleyfae/contextwp-sdk",
+            "version": "dev-main",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ashleyfae/contextwp-sdk.git",
+                "reference": "2c28fadd4f72b6d6dfab51533f704af686b6d678"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ashleyfae/contextwp-sdk/zipball/2c28fadd4f72b6d6dfab51533f704af686b6d678",
+                "reference": "2c28fadd4f72b6d6dfab51533f704af686b6d678",
+                "shasum": ""
+            },
+            "require": {
+                "ashleyfae/wp-db": "dev-main",
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "10up/wp_mock": "0.4.2",
+                "mockery/mockery": "^1.5",
+                "phpunit/phpunit": "^9.5.20"
+            },
+            "default-branch": true,
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/init.php"
+                ],
+                "psr-4": {
+                    "ContextWP\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "support": {
+                "issues": "https://github.com/ashleyfae/contextwp-sdk/issues",
+                "source": "https://github.com/ashleyfae/contextwp-sdk/tree/main"
+            },
+            "time": "2022-04-18T11:53:39+00:00"
+        },
+        {
+            "name": "ashleyfae/wp-db",
+            "version": "dev-main",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ashleyfae/wp-db.git",
+                "reference": "346622ffa5efd62313bd74e5dc8d02ee6841556c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ashleyfae/wp-db/zipball/346622ffa5efd62313bd74e5dc8d02ee6841556c",
+                "reference": "346622ffa5efd62313bd74e5dc8d02ee6841556c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0"
+            },
+            "default-branch": true,
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Ashleyfae\\WPDB\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "description": "Wrapper for wpdb.",
+            "support": {
+                "issues": "https://github.com/ashleyfae/wp-db/issues",
+                "source": "https://github.com/ashleyfae/wp-db/tree/main"
+            },
+            "time": "2022-04-10T11:38:38+00:00"
+        }
+    ],
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
@@ -136,16 +212,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.13.2",
+            "version": "v4.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
+                "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/63a79e8daa781cac14e5195e63ed8ae231dd10fd",
+                "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd",
                 "shasum": ""
             },
             "require": {
@@ -186,9 +262,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.1"
             },
-            "time": "2021-11-30T19:35:32+00:00"
+            "time": "2021-11-03T20:52:16+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -463,16 +539,16 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.15.0",
+            "version": "1.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
+                "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e",
+                "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e",
                 "shasum": ""
             },
             "require": {
@@ -524,22 +600,22 @@
             ],
             "support": {
                 "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
+                "source": "https://github.com/phpspec/prophecy/tree/1.14.0"
             },
-            "time": "2021-12-08T12:19:24+00:00"
+            "time": "2021-09-10T09:02:12+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.10",
+            "version": "9.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687"
+                "reference": "f301eb1453c9e7a1bc912ee8b0ea9db22c60223b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d5850aaf931743067f4bfc1ae4cbd06468400687",
-                "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f301eb1453c9e7a1bc912ee8b0ea9db22c60223b",
+                "reference": "f301eb1453c9e7a1bc912ee8b0ea9db22c60223b",
                 "shasum": ""
             },
             "require": {
@@ -595,7 +671,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.10"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.9"
             },
             "funding": [
                 {
@@ -603,20 +679,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-05T09:12:13+00:00"
+            "time": "2021-11-19T15:21:02+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "3.0.6",
+            "version": "3.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
+                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
-                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8",
+                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8",
                 "shasum": ""
             },
             "require": {
@@ -655,7 +731,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5"
             },
             "funding": [
                 {
@@ -663,7 +739,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-02T12:48:52+00:00"
+            "time": "2020-09-28T05:57:25+00:00"
         },
         {
             "name": "phpunit/php-invoker",
@@ -2106,12 +2182,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
-                "reference": "5ea3536428944955f969bc764bbe09738e151ada"
+                "reference": "0b45bcca2664c3d6a75f3e1343d4bbd630b2bb32"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/5ea3536428944955f969bc764bbe09738e151ada",
-                "reference": "5ea3536428944955f969bc764bbe09738e151ada",
+                "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/0b45bcca2664c3d6a75f3e1343d4bbd630b2bb32",
+                "reference": "0b45bcca2664c3d6a75f3e1343d4bbd630b2bb32",
                 "shasum": ""
             },
             "require": {
@@ -2160,18 +2236,19 @@
                 "issues": "https://github.com/Yoast/PHPUnit-Polyfills/issues",
                 "source": "https://github.com/Yoast/PHPUnit-Polyfills"
             },
-            "time": "2021-11-23T01:37:03+00:00"
+            "time": "2021-11-18T17:12:39+00:00"
         }
     ],
     "aliases": [],
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "stability-flags": {
+        "ashleyfae/contextwp-sdk": 20,
         "yoast/phpunit-polyfills": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^7.0|^8.0"
+        "php": "^7.1|^8.0"
     },
     "platform-dev": [],
     "plugin-api-version": "2.1.0"
diff --git a/includes/abstract-class-base-object.php b/includes/abstract-class-base-object.php
deleted file mode 100644
index 799d0e2a..00000000
--- a/includes/abstract-class-base-object.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * Base Object
- *
- * Extended by core objects.
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Base_Object
- * @package Book_Database
- */
-abstract class Base_Object {
-
-	protected $id = 0;
-
-	protected $date_created = '';
-
-	protected $date_modified = '';
-
-	/**
-	 * Object constructor
-	 *
-	 * @param array|object $args Object to populate vars for.
-	 */
-	public function __construct( $args = array() ) {
-		$this->set_vars( $args );
-	}
-
-	/**
-	 * Set class properties from arguments
-	 *
-	 * @param array $args
-	 */
-	protected function set_vars( $args = array() ) {
-
-		// Bail if empty.
-		if ( empty( $args ) ) {
-			return;
-		}
-
-		// Cast to an array.
-		if ( ! is_array( $args ) ) {
-			$args = (array) $args;
-		}
-
-		foreach ( $args as $key => $value ) {
-			if ( '0000-00-00 00:00:00' === $value ) {
-				$value = null;
-			}
-
-			$this->{$key} = $value;
-		}
-
-	}
-
-	/**
-	 * Get the ID
-	 *
-	 * @return int
-	 */
-	public function get_id() {
-		return absint( $this->id );
-	}
-
-	/**
-	 * Get the created date
-	 *
-	 * @param bool   $formatted Whether or not to format the result for display.
-	 * @param string $format    Format to display in. Defaults to site format.
-	 *
-	 * @return string
-	 */
-	public function get_date_created( $formatted = false, $format = '' ) {
-		return ( ! empty( $this->date_created ) && $formatted ) ? format_date( $this->date_created, $format ) : $this->date_created;
-	}
-
-	/**
-	 * Get the modified date
-	 *
-	 * @param bool   $formatted Whether or not to format the result for display.
-	 * @param string $format    Format to display in. Defaults to site format.
-	 *
-	 * @return string
-	 */
-	public function get_date_modified( $formatted = false, $format = '' ) {
-		return ( ! empty( $this->date_modified ) && $formatted ) ? format_date( $this->date_modified, $format ) : $this->date_modified;
-	}
-
-	/**
-	 * Get all object properties as an array
-	 *
-	 * @return array
-	 */
-	public function export_vars() {
-		return get_object_vars( $this );
-	}
-
-}
\ No newline at end of file
diff --git a/includes/admin/admin-assets.php b/includes/admin/admin-assets.php
index 61ec13cf..2973ccac 100644
--- a/includes/admin/admin-assets.php
+++ b/includes/admin/admin-assets.php
@@ -31,6 +31,7 @@ function enqueue_admin_assets( $hook ) {
 	wp_enqueue_media();
 
 	wp_register_script( 'moment', BDB_URL . 'assets/js/build/moment.min.js', array(), '2.24.0', true );
+    wp_register_script('alpinejs', BDB_URL.'assets/js/build/alpine.min.js', [], '3.9.1', false);
 
 	// JS
 	$localized = array(
@@ -67,7 +68,7 @@ function enqueue_admin_assets( $hook ) {
 
 	} else {
 
-		$deps = array( 'jquery', 'jquery-ui-sortable', 'suggest', 'wp-util', 'moment' );
+		$deps = array( 'jquery', 'jquery-ui-sortable', 'suggest', 'wp-util', 'moment', 'alpinejs' );
 		wp_enqueue_script( 'book-database', BDB_URL . 'assets/js/build/admin.min.js', $deps, time(), true );
 		wp_localize_script( 'book-database', 'bdbVars', $localized );
 
@@ -127,4 +128,15 @@ function enqueue_admin_global_assets( $hook ) {
 
 }
 
-add_action( 'admin_enqueue_scripts', __NAMESPACE__ . '\enqueue_admin_global_assets' );
\ No newline at end of file
+add_action( 'admin_enqueue_scripts', __NAMESPACE__ . '\enqueue_admin_global_assets' );
+
+/**
+ * Add `defer` to the AlpineJS script tag.
+ */
+add_filter('script_loader_tag', function ($url) {
+    if (false !== strpos($url, BDB_URL.'assets/js/build/alpine.min.js')) {
+        $url = str_replace(' src', ' defer src', $url);
+    }
+
+    return $url;
+});
diff --git a/includes/admin/authors/author-actions.php b/includes/admin/authors/author-actions.php
index cc806ef7..f7a8ef60 100644
--- a/includes/admin/authors/author-actions.php
+++ b/includes/admin/authors/author-actions.php
@@ -9,6 +9,8 @@
 
 namespace Book_Database;
 
+use Book_Database\Exceptions\Exception;
+
 /**
  * Add a new author
  */
@@ -135,4 +137,4 @@ function process_delete_author() {
 
 }
 
-add_action( 'admin_init', __NAMESPACE__ . '\process_delete_author' );
\ No newline at end of file
+add_action( 'admin_init', __NAMESPACE__ . '\process_delete_author' );
diff --git a/includes/admin/authors/class-authors-list-table.php b/includes/admin/authors/class-authors-list-table.php
index 8defdef2..3b5e3ee3 100644
--- a/includes/admin/authors/class-authors-list-table.php
+++ b/includes/admin/authors/class-authors-list-table.php
@@ -9,11 +9,16 @@
 
 namespace Book_Database;
 
+use Book_Database\Admin\Utils\ListTable;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Models\Author;
+
 /**
  * Class Authors_List_Table
+ *
  * @package Book_Database
  */
-class Authors_List_Table extends List_Table {
+class Authors_List_Table extends ListTable {
 
 	/**
 	 * Authors_List_Table constructor.
@@ -271,4 +276,4 @@ private function show_admin_notice( $action, $number = 1, $class = 'success' ) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/admin/authors/edit-author.php b/includes/admin/authors/edit-author.php
index dbd700b9..71b266ae 100644
--- a/includes/admin/authors/edit-author.php
+++ b/includes/admin/authors/edit-author.php
@@ -9,7 +9,9 @@
 
 namespace Book_Database;
 
-$author = ! empty( $_GET['author_id'] ) ? get_book_author( absint( $_GET['author_id'] ) ) : false;
+use Book_Database\Models\Author;
+
+$author = ! empty($_GET['author_id'] ) ? get_book_author( absint($_GET['author_id'] ) ) : false;
 
 if ( ! empty( $_GET['view'] ) && 'edit' === $_GET['view'] && empty( $author ) ) {
 	wp_die( __( 'Invalid author ID.', 'book-database' ) );
diff --git a/includes/admin/book-terms/book-term-actions.php b/includes/admin/book-terms/book-term-actions.php
index a31ac02e..d810e1ca 100644
--- a/includes/admin/book-terms/book-term-actions.php
+++ b/includes/admin/book-terms/book-term-actions.php
@@ -9,6 +9,8 @@
 
 namespace Book_Database;
 
+use Book_Database\Exceptions\Exception;
+
 /**
  * Add a new book_term
  */
@@ -137,4 +139,4 @@ function process_delete_book_term() {
 
 }
 
-add_action( 'admin_init', __NAMESPACE__ . '\process_delete_book_term' );
\ No newline at end of file
+add_action( 'admin_init', __NAMESPACE__ . '\process_delete_book_term' );
diff --git a/includes/admin/book-terms/class-book-terms-list-table.php b/includes/admin/book-terms/class-book-terms-list-table.php
index d587ccf4..a4743401 100644
--- a/includes/admin/book-terms/class-book-terms-list-table.php
+++ b/includes/admin/book-terms/class-book-terms-list-table.php
@@ -9,11 +9,17 @@
 
 namespace Book_Database;
 
+use Book_Database\Admin\Utils\ListTable;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Models\BookTaxonomy;
+use Book_Database\Models\BookTerm;
+
 /**
  * Class Book_Terms_List_Table
+ *
  * @package Book_Database
  */
-class Book_Terms_List_Table extends List_Table {
+class Book_Terms_List_Table extends ListTable {
 
 	protected $default_taxonomy;
 
@@ -128,7 +134,7 @@ protected function get_primary_column_name() {
 	/**
 	 * Render the "Name" column.
 	 *
-	 * @param Book_Term $item
+	 * @param BookTerm $item
 	 *
 	 * @return string
 	 */
@@ -156,7 +162,7 @@ public function column_name( $item ) {
 	/**
 	 * Renders most of the columns in the list table
 	 *
-	 * @param Book_Term $item
+	 * @param BookTerm $item
 	 * @param string    $column_name
 	 *
 	 * @return string Column value.
@@ -340,7 +346,7 @@ public function get_views() {
 			foreach ( $counts as $status => $count ) {
 				$taxonomy = get_book_taxonomy_by( 'slug', $status );
 
-				if ( ! $taxonomy instanceof Book_Taxonomy ) {
+				if ( ! $taxonomy instanceof BookTaxonomy ) {
 					continue;
 				}
 
@@ -361,4 +367,4 @@ public function get_views() {
 		return $views;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/admin/books/book-actions.php b/includes/admin/books/book-actions.php
index 5baac8a5..f4ea59cb 100644
--- a/includes/admin/books/book-actions.php
+++ b/includes/admin/books/book-actions.php
@@ -9,6 +9,9 @@
 
 namespace Book_Database;
 
+use Book_Database\Exceptions\Exception;
+use Book_Database\Models\Series;
+
 /**
  * Add a new book
  */
@@ -253,4 +256,4 @@ function process_delete_book() {
 
 }
 
-add_action( 'admin_init', __NAMESPACE__ . '\process_delete_book' );
\ No newline at end of file
+add_action( 'admin_init', __NAMESPACE__ . '\process_delete_book' );
diff --git a/includes/admin/books/class-books-list-table.php b/includes/admin/books/class-books-list-table.php
index c744f0b1..a1267d87 100644
--- a/includes/admin/books/class-books-list-table.php
+++ b/includes/admin/books/class-books-list-table.php
@@ -9,11 +9,17 @@
 
 namespace Book_Database;
 
+use Book_Database\Admin\Utils\ListTable;
+use Book_Database\Database\Books\BooksQuery;
+use Book_Database\Models\Book;
+use Book_Database\ValueObjects\Rating;
+
 /**
  * Class Books_List_Table
+ *
  * @package Book_Database
  */
-class Books_List_Table extends List_Table {
+class Books_List_Table extends ListTable {
 
 	/**
 	 * Mode
@@ -459,7 +465,7 @@ protected function get_query_args( $count = false ) {
 	 */
 	public function get_object_data( $count = false ) {
 
-		$query = new Books_Query();
+		$query = new BooksQuery();
 
 		return $query->get_books( $this->get_query_args( $count ) );
 
diff --git a/includes/admin/books/class-monthly-books-list-table.php b/includes/admin/books/class-monthly-books-list-table.php
index d1aa3d97..86aed68b 100644
--- a/includes/admin/books/class-monthly-books-list-table.php
+++ b/includes/admin/books/class-monthly-books-list-table.php
@@ -9,8 +9,11 @@
 
 namespace Book_Database;
 
+use Book_Database\Models\Book;
+
 /**
  * Class Monthly_Books_List_Table
+ *
  * @package Book_Database
  */
 class Monthly_Books_List_Table extends Books_List_Table {
@@ -747,4 +750,4 @@ protected function set_queried_item( $iterator = 1, $type = 'items', $item_id =
 	public function no_items() {
 		// Do nothing; calendars always have rows
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/admin/books/edit-book-fields.php b/includes/admin/books/edit-book-fields.php
index 7b5cdd4f..6f11c99a 100644
--- a/includes/admin/books/edit-book-fields.php
+++ b/includes/admin/books/edit-book-fields.php
@@ -9,9 +9,9 @@
 
 namespace Book_Database\Admin\Fields;
 
-use Book_Database\Book;
-use Book_Database\Rating;
-use Book_Database\Series;
+use Book_Database\Models\Book;
+use Book_Database\ValueObjects\Rating;
+use Book_Database\Models\Series;
 use function Book_Database\book_database;
 use function Book_Database\count_books;
 use function Book_Database\generate_book_index_title;
diff --git a/includes/admin/books/edit-book.php b/includes/admin/books/edit-book.php
index 9e521c07..50db21ce 100644
--- a/includes/admin/books/edit-book.php
+++ b/includes/admin/books/edit-book.php
@@ -9,7 +9,9 @@
 
 namespace Book_Database;
 
-$book = ! empty( $_GET['book_id'] ) ? get_book( absint( $_GET['book_id'] ) ) : false;
+use Book_Database\Models\Book;
+
+$book = ! empty($_GET['book_id'] ) ? get_book( absint($_GET['book_id'] ) ) : false;
 
 if ( ! empty( $_GET['view'] ) && 'edit' === $_GET['view'] && empty( $book ) ) {
 	wp_die( __( 'Invalid book ID.', 'book-database' ) );
@@ -70,4 +72,4 @@
 		wp_nonce_field( 'bdb_add_book', 'bdb_add_book_nonce' );
 	}
 	?>
-</form>
\ No newline at end of file
+</form>
diff --git a/includes/admin/editions/edition-actions.php b/includes/admin/editions/edition-actions.php
index 81df9bac..ea949d1a 100644
--- a/includes/admin/editions/edition-actions.php
+++ b/includes/admin/editions/edition-actions.php
@@ -9,6 +9,8 @@
 
 namespace Book_Database;
 
+use Book_Database\Models\Book;
+
 /**
  * Add a table of editions to the Edit Book page
  *
@@ -141,4 +143,4 @@ function load_edition_templates() {
 
 }
 
-add_action( 'admin_footer', __NAMESPACE__ . '\load_edition_templates' );
\ No newline at end of file
+add_action( 'admin_footer', __NAMESPACE__ . '\load_edition_templates' );
diff --git a/includes/admin/licensing/class-license-key.php b/includes/admin/licensing/class-license-key.php
index 1f6705cd..5d6618ab 100644
--- a/includes/admin/licensing/class-license-key.php
+++ b/includes/admin/licensing/class-license-key.php
@@ -9,8 +9,11 @@
 
 namespace Book_Database;
 
+use Book_Database\Exceptions\Exception;
+
 /**
  * Class License_Key
+ *
  * @package Book_Database
  */
 class License_Key {
@@ -432,4 +435,4 @@ public function get_renewal_url() {
 		return add_query_arg( 'edd_license_key', urlencode( $this->get_key() ), trailingslashit( NOSE_GRAZE_STORE_URL ) . 'checkout/' );
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/admin/licensing/license-actions.php b/includes/admin/licensing/license-actions.php
index afad1423..c29c934d 100644
--- a/includes/admin/licensing/license-actions.php
+++ b/includes/admin/licensing/license-actions.php
@@ -9,6 +9,8 @@
 
 namespace Book_Database;
 
+use Book_Database\Exceptions\Exception;
+
 /**
  * Initialize the updater
  */
@@ -135,4 +137,4 @@ function refresh_license_key() {
 
 }
 
-add_action( 'wp_ajax_bdb_refresh_license_key', __NAMESPACE__ . '\refresh_license_key' );
\ No newline at end of file
+add_action( 'wp_ajax_bdb_refresh_license_key', __NAMESPACE__ . '\refresh_license_key' );
diff --git a/includes/admin/reading-logs/reading-log-actions.php b/includes/admin/reading-logs/reading-log-actions.php
index b2bb7a49..a8c1cecf 100644
--- a/includes/admin/reading-logs/reading-log-actions.php
+++ b/includes/admin/reading-logs/reading-log-actions.php
@@ -9,6 +9,8 @@
 
 namespace Book_Database;
 
+use Book_Database\Models\Book;
+
 /**
  * Add a table of reading logs to the Edit Book page
  *
@@ -145,4 +147,4 @@ function load_reading_log_templates() {
 
 }
 
-add_action( 'admin_footer', __NAMESPACE__ . '\load_reading_log_templates' );
\ No newline at end of file
+add_action( 'admin_footer', __NAMESPACE__ . '\load_reading_log_templates' );
diff --git a/includes/admin/reviews/class-reviews-list-table.php b/includes/admin/reviews/class-reviews-list-table.php
index 88d92566..a0986e54 100644
--- a/includes/admin/reviews/class-reviews-list-table.php
+++ b/includes/admin/reviews/class-reviews-list-table.php
@@ -9,11 +9,19 @@
 
 namespace Book_Database;
 
+use Book_Database\Admin\Utils\ListTable;
+use Book_Database\Database\Reviews\ReviewsQuery;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Models\Book;
+use Book_Database\Models\Review;
+use Book_Database\ValueObjects\Rating;
+
 /**
  * Class Reviews_List_Table
+ *
  * @package Book_Database
  */
-class Reviews_List_Table extends List_Table {
+class Reviews_List_Table extends ListTable {
 
 	/**
 	 * Reviews_List_Table constructor.
@@ -327,7 +335,7 @@ public function get_object_data( $count = false ) {
 			);
 		}
 
-		$query = new Reviews_Query();
+		$query = new ReviewsQuery();
 
 		return $query->get_reviews( $args );
 
@@ -503,4 +511,4 @@ protected function extra_tablenav( $which ) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/admin/reviews/edit-review.php b/includes/admin/reviews/edit-review.php
index 6e535272..306eca24 100644
--- a/includes/admin/reviews/edit-review.php
+++ b/includes/admin/reviews/edit-review.php
@@ -9,7 +9,9 @@
 
 namespace Book_Database;
 
-$review = ! empty( $_GET['review_id'] ) ? get_review( absint( $_GET['review_id'] ) ) : false;
+use Book_Database\Models\Review;
+
+$review = ! empty($_GET['review_id'] ) ? get_review( absint($_GET['review_id'] ) ) : false;
 
 if ( ! empty( $_GET['view'] ) && 'edit' === $_GET['view'] && empty( $review ) ) {
 	wp_die( __( 'Invalid review ID.', 'book-database' ) );
@@ -75,4 +77,4 @@
 		wp_nonce_field( 'bdb_add_review', 'bdb_add_review_nonce' );
 	}
 	?>
-</form>
\ No newline at end of file
+</form>
diff --git a/includes/admin/reviews/review-actions.php b/includes/admin/reviews/review-actions.php
index 32b63232..74883736 100644
--- a/includes/admin/reviews/review-actions.php
+++ b/includes/admin/reviews/review-actions.php
@@ -9,6 +9,8 @@
 
 namespace Book_Database;
 
+use Book_Database\Exceptions\Exception;
+
 /**
  * Add a new review
  */
@@ -145,4 +147,4 @@ function process_delete_review() {
 
 }
 
-add_action( 'admin_init', __NAMESPACE__ . '\process_delete_review' );
\ No newline at end of file
+add_action( 'admin_init', __NAMESPACE__ . '\process_delete_review' );
diff --git a/includes/admin/reviews/review-fields.php b/includes/admin/reviews/review-fields.php
index 955c7c02..86d1e7a1 100644
--- a/includes/admin/reviews/review-fields.php
+++ b/includes/admin/reviews/review-fields.php
@@ -10,9 +10,9 @@
 namespace Book_Database\Admin\Reviews\Fields;
 
 use Book_Database\Book_Layout;
-use Book_Database\Rating;
-use Book_Database\Reading_Log;
-use Book_Database\Review;
+use Book_Database\ValueObjects\Rating;
+use Book_Database\Models\ReadingLog;
+use Book_Database\Models\Review;
 use function Book_Database\book_database;
 use function Book_Database\get_book;
 use function Book_Database\get_books_admin_page_url;
@@ -287,4 +287,4 @@ function book_info( $review ) {
 
 }
 
-add_action( 'book-database/review-edit/after-fields', __NAMESPACE__ . '\book_info' );
\ No newline at end of file
+add_action( 'book-database/review-edit/after-fields', __NAMESPACE__ . '\book_info' );
diff --git a/includes/admin/series/class-series-list-table.php b/includes/admin/series/class-series-list-table.php
index 869587fd..2bc80228 100644
--- a/includes/admin/series/class-series-list-table.php
+++ b/includes/admin/series/class-series-list-table.php
@@ -9,11 +9,16 @@
 
 namespace Book_Database;
 
+use Book_Database\Admin\Utils\ListTable;
+use Book_Database\Models\Series;
+use Book_Database\ValueObjects\Rating;
+
 /**
  * Class Series_List_Table
+ *
  * @package Book_Database
  */
-class Series_List_Table extends List_Table {
+class Series_List_Table extends ListTable {
 
 	/**
 	 * Series_List_Table constructor.
@@ -284,4 +289,4 @@ private function show_admin_notice( $action, $number = 1, $class = 'success' ) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/admin/series/edit-series.php b/includes/admin/series/edit-series.php
index 3b752f26..5f9fa832 100644
--- a/includes/admin/series/edit-series.php
+++ b/includes/admin/series/edit-series.php
@@ -9,7 +9,9 @@
 
 namespace Book_Database;
 
-$series = ! empty( $_GET['series_id'] ) ? get_book_series_by( 'id', absint( $_GET['series_id'] ) ) : false;
+use Book_Database\Models\Series;
+
+$series = ! empty($_GET['series_id'] ) ? get_book_series_by( 'id', absint($_GET['series_id'] ) ) : false;
 
 if ( ! empty( $_GET['view'] ) && 'edit' === $_GET['view'] && empty( $series ) ) {
 	wp_die( __( 'Invalid series ID.', 'book-database' ) );
diff --git a/includes/admin/series/series-actions.php b/includes/admin/series/series-actions.php
index 2444d508..6ee74f72 100644
--- a/includes/admin/series/series-actions.php
+++ b/includes/admin/series/series-actions.php
@@ -9,6 +9,8 @@
 
 namespace Book_Database;
 
+use Book_Database\Exceptions\Exception;
+
 /**
  * Add a new series
  */
@@ -135,4 +137,4 @@ function process_delete_series() {
 
 }
 
-add_action( 'admin_init', __NAMESPACE__ . '\process_delete_series' );
\ No newline at end of file
+add_action( 'admin_init', __NAMESPACE__ . '\process_delete_series' );
diff --git a/includes/analytics/analytics-functions.php b/includes/analytics/analytics-functions.php
index 2d167ce7..0fea188c 100644
--- a/includes/analytics/analytics-functions.php
+++ b/includes/analytics/analytics-functions.php
@@ -9,7 +9,7 @@
 
 namespace Book_Database\Analytics;
 
-use Book_Database\Exception;
+use Book_Database\Exceptions\Exception;
 use function Book_Database\get_site_timezone;
 
 /**
@@ -169,8 +169,7 @@ function get_date_filter_range( $option = '', $format = 'Y-m-d H:i:s' ) {
  * @throws Exception
  */
 function get_dataset_value( $dataset, $args = array() ) {
-
-	$class_name = __NAMESPACE__ . '\\' . $dataset;
+	$class_name = __NAMESPACE__ . '\\Datasets\\' . $dataset;
 
 	if ( class_exists( $class_name ) ) {
 		$dataset = new $class_name( $args );
@@ -182,5 +181,4 @@ function get_dataset_value( $dataset, $args = array() ) {
 	}
 
 	throw new Exception( 'invalid-dataset', __( 'Invalid dataset.', 'book-database' ), 404 );
-
-}
\ No newline at end of file
+}
diff --git a/includes/authors/author-functions.php b/includes/authors/author-functions.php
index 91722405..751bf7fc 100644
--- a/includes/authors/author-functions.php
+++ b/includes/authors/author-functions.php
@@ -9,6 +9,10 @@
 
 namespace Book_Database;
 
+use Book_Database\Database\Authors\AuthorsQuery;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Models\Author;
+
 /**
  * Get a single author by its ID
  *
@@ -18,7 +22,7 @@
  */
 function get_book_author( $author_id ) {
 
-	$query = new Authors_Query();
+	$query = new AuthorsQuery();
 
 	return $query->get_item( $author_id );
 
@@ -34,7 +38,7 @@ function get_book_author( $author_id ) {
  */
 function get_book_author_by( $column_name, $column_value ) {
 
-	$query = new Authors_Query();
+	$query = new AuthorsQuery();
 
 	return $query->get_item_by( $column_name, $column_value );
 
@@ -80,7 +84,7 @@ function get_book_authors( $args = array() ) {
 		'number' => 20
 	) );
 
-	$query = new Authors_Query();
+	$query = new AuthorsQuery();
 
 	return $query->query( $args );
 
@@ -101,7 +105,7 @@ function count_book_authors( $args = array() ) {
 		'count' => true
 	) );
 
-	$query = new Authors_Query( $args );
+	$query = new AuthorsQuery( $args );
 
 	return absint( $query->found_items );
 
@@ -141,7 +145,7 @@ function add_book_author( $args = array() ) {
 	// Generate a slug.
 	$args['slug'] = ! empty( $args['slug'] ) ? unique_book_slug( $args['slug'], 'book_taxonomy' ) : unique_book_slug( sanitize_title( $args['name'] ), 'author' );
 
-	$query     = new Authors_Query();
+	$query     = new AuthorsQuery();
 	$author_id = $query->add_item( $args );
 
 	if ( empty( $author_id ) ) {
@@ -174,7 +178,7 @@ function update_book_author( $author_id, $args = array() ) {
 		$args['slug'] = unique_book_slug( $args['slug'], 'author' );
 	}
 
-	$query   = new Authors_Query();
+	$query   = new AuthorsQuery();
 	$updated = $query->update_item( $author_id, $args );
 
 	if ( ! $updated ) {
@@ -195,7 +199,7 @@ function update_book_author( $author_id, $args = array() ) {
  */
 function delete_book_author( $author_id ) {
 
-	$query   = new Authors_Query();
+	$query   = new AuthorsQuery();
 	$deleted = $query->delete_item( $author_id );
 
 	if ( ! $deleted ) {
@@ -262,4 +266,4 @@ function get_authors_admin_page_url( $args = array() ) {
 
 	return add_query_arg( $sanitized_args, admin_url( 'admin.php?page=bdb-authors' ) );
 
-}
\ No newline at end of file
+}
diff --git a/includes/authors/class-author.php b/includes/authors/class-author.php
deleted file mode 100644
index 6727dc35..00000000
--- a/includes/authors/class-author.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Author Object
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Author
- * @package Book_Database
- */
-class Author extends Base_Object {
-
-	protected $name = '';
-
-	protected $slug = '';
-
-	protected $description = '';
-
-	protected $image_id = null;
-
-	protected $links = array();
-
-	protected $book_count = 0;
-
-	/**
-	 * Get the author's name
-	 *
-	 * @return string
-	 */
-	public function get_name() {
-		return $this->name;
-	}
-
-	/**
-	 * Get the author slug
-	 *
-	 * @return string
-	 */
-	public function get_slug() {
-		return $this->slug;
-	}
-
-	/**
-	 * Get the author description
-	 *
-	 * @return string
-	 */
-	public function get_description() {
-		return $this->description;
-	}
-
-	/**
-	 * Get the ID of the image attachment
-	 *
-	 * @return int
-	 */
-	public function get_image_id() {
-		return ! empty( $this->image_id ) ? absint( $this->image_id ) : 0;
-	}
-
-	/**
-	 * Get the author image URL
-	 *
-	 * @param string $size Desired image size.
-	 *
-	 * @return string
-	 */
-	public function get_image_url( $size = 'full' ) {
-
-		$url      = '';
-		$image_id = $this->get_image_id();
-
-		if ( ! empty( $image_id ) ) {
-			$url = wp_get_attachment_image_url( $image_id, $size );
-		}
-
-		return apply_filters( 'book-database/author/get/image_url', $url, $image_id, $this );
-
-	}
-
-	/**
-	 * Get the author image HTML.
-	 *
-	 * @param string|array $size Desired image size.
-	 * @param array        $args Arguments to use in `wp_get_attachment_image()`.
-	 *
-	 * @return string
-	 */
-	public function get_image( $size = 'full', $args = array() ) {
-
-		$image    = '';
-		$image_id = $this->get_image_id();
-
-		if ( $image_id ) {
-			$image = wp_get_attachment_image( absint( $image_id ), $size, false, $args );
-		}
-
-		return apply_filters( 'book-database/author/get/image', $image, $image_id, $this );
-
-	}
-
-	/**
-	 * Get an array of author links
-	 *
-	 * @return array()
-	 */
-	public function get_links() {
-		return $this->links;
-	}
-
-	/**
-	 * Get the number of books by this author
-	 *
-	 * @return int
-	 */
-	public function get_book_count() {
-		return absint( $this->book_count );
-	}
-
-}
\ No newline at end of file
diff --git a/includes/blocks.php b/includes/blocks.php
index 0e79d691..fa997b2a 100644
--- a/includes/blocks.php
+++ b/includes/blocks.php
@@ -12,6 +12,8 @@
 /**
  * Adds a new block category for Book Database.
  *
+ * Note: This filter requires WP 5.8+
+ *
  * @param array    $categories
  * @param \WP_Post $post
  *
@@ -28,7 +30,7 @@ function register_block_category( $categories, $post ) {
 	return $categories;
 }
 
-add_filter( 'block_categories', __NAMESPACE__ . '\register_block_category', 10, 2 );
+add_filter( 'block_categories_all', __NAMESPACE__ . '\register_block_category', 10, 2 );
 
 /**
  * Register Gutenberg blocks
diff --git a/includes/book-author-relationships/book-author-relationship-functions.php b/includes/book-author-relationships/book-author-relationship-functions.php
index e6eb599b..c64c703d 100644
--- a/includes/book-author-relationships/book-author-relationship-functions.php
+++ b/includes/book-author-relationships/book-author-relationship-functions.php
@@ -9,16 +9,21 @@
 
 namespace Book_Database;
 
+use Book_Database\Database\BookAuthor\BookAuthorQuery;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Models\Author;
+use Book_Database\Models\BookAuthorRelationship;
+
 /**
  * Get a single book-author-relationship by its ID
  *
  * @param int $relationship_id
  *
- * @return Book_Author_Relationship|false
+ * @return BookAuthorRelationship|false
  */
 function get_book_author_relationship( $relationship_id ) {
 
-	$query = new Book_Author_Relationships_Query();
+	$query = new BookAuthorQuery();
 
 	return $query->get_item( $relationship_id );
 
@@ -31,7 +36,7 @@ function get_book_author_relationship( $relationship_id ) {
  * @param int   $author_id ID of the author.
  * @param array $args      Query arguments to override the defaults.
  *
- * @return Book_Author_Relationship|false|mixed
+ * @return BookAuthorRelationship|false|mixed
  */
 function get_book_author_relationship_by_book_and_author( $book_id, $author_id, $args = array() ) {
 
@@ -79,7 +84,7 @@ function get_book_author_relationship_by_book_and_author( $book_id, $author_id,
  * @type bool         $update_cache        Whether to prime the cache for found items. Default false.
  * }
  *
- * @return Book_Author_Relationship[] Array of Book_Author_Relationship objects.
+ * @return BookAuthorRelationship[] Array of Book_Author_Relationship objects.
  */
 function get_book_author_relationships( $args = array() ) {
 
@@ -87,7 +92,7 @@ function get_book_author_relationships( $args = array() ) {
 		'number' => 20
 	) );
 
-	$query = new Book_Author_Relationships_Query();
+	$query = new BookAuthorQuery();
 
 	return $query->query( $args );
 
@@ -108,7 +113,7 @@ function count_book_author_relationships( $args = array() ) {
 		'count' => true
 	) );
 
-	$query = new Book_Author_Relationships_Query( $args );
+	$query = new BookAuthorQuery( $args );
 
 	return absint( $query->found_items );
 
@@ -141,7 +146,7 @@ function add_book_author_relationship( $args ) {
 		throw new Exception( 'missing_required_parameter', __( 'A book ID is required.', 'book-database' ), 400 );
 	}
 
-	$query           = new Book_Author_Relationships_Query();
+	$query           = new BookAuthorQuery();
 	$relationship_id = $query->add_item( $args );
 
 	if ( empty( $relationship_id ) ) {
@@ -175,11 +180,11 @@ function delete_book_author_relationship( $relationship_id ) {
 
 	$relationship = get_book_author_relationship( $relationship_id );
 
-	if ( ! $relationship instanceof Book_Author_Relationship ) {
+	if ( ! $relationship instanceof BookAuthorRelationship ) {
 		return true;
 	}
 
-	$query   = new Book_Author_Relationships_Query();
+	$query   = new BookAuthorQuery();
 	$deleted = $query->delete_item( $relationship_id );
 
 	if ( ! $deleted ) {
@@ -382,4 +387,4 @@ function set_book_authors( $book_id, $authors, $append = false ) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/book-author-relationships/class-book-author-relationship.php b/includes/book-author-relationships/class-book-author-relationship.php
deleted file mode 100644
index 5649839b..00000000
--- a/includes/book-author-relationships/class-book-author-relationship.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Book Author Relationship Object
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Author_Relationship
- * @package Book_Database
- */
-class Book_Author_Relationship extends Base_Object {
-
-	protected $author_id = 0;
-
-	protected $book_id = 0;
-
-	/**
-	 * Get the author ID
-	 *
-	 * @return int
-	 */
-	public function get_author_id() {
-		return absint( $this->author_id );
-	}
-
-	/**
-	 * Get the book ID
-	 *
-	 * @return int
-	 */
-	public function get_book_id() {
-		return absint( $this->book_id );
-	}
-
-}
\ No newline at end of file
diff --git a/includes/book-links/book-link-functions.php b/includes/book-links/book-link-functions.php
index c8a48dfa..0bd2a5f8 100644
--- a/includes/book-links/book-link-functions.php
+++ b/includes/book-links/book-link-functions.php
@@ -9,16 +9,20 @@
 
 namespace Book_Database;
 
+use Book_Database\Database\BookLinks\BookLinksQuery;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Models\BookLink;
+
 /**
  * Get a single link by its ID
  *
  * @param int $link_id
  *
- * @return Book_Link|false
+ * @return BookLink|false
  */
 function get_book_link( $link_id ) {
 
-	$query = new Book_Links_Query();
+	$query = new BookLinksQuery();
 
 	return $query->get_item( $link_id );
 
@@ -30,11 +34,11 @@ function get_book_link( $link_id ) {
  * @param string $column_name
  * @param mixed  $column_value
  *
- * @return Book_Link|false
+ * @return BookLink|false
  */
 function get_book_link_by( $column_name, $column_value ) {
 
-	$query = new Book_Links_Query();
+	$query = new BookLinksQuery();
 
 	return $query->get_item_by( $column_name, $column_value );
 
@@ -68,7 +72,7 @@ function get_book_link_by( $column_name, $column_value ) {
  * @type bool         $update_cache        Whether to prime the cache for found items. Default false.
  * }
  *
- * @return Book_Link[] Array of Book_Link objects.
+ * @return BookLink[] Array of Book_Link objects.
  */
 function get_book_links( $args = array() ) {
 
@@ -76,7 +80,7 @@ function get_book_links( $args = array() ) {
 		'number' => 20
 	) );
 
-	$query = new Book_Links_Query();
+	$query = new BookLinksQuery();
 
 	return $query->query( $args );
 
@@ -97,7 +101,7 @@ function count_book_links( $args = array() ) {
 		'count' => true
 	) );
 
-	$query = new Book_Links_Query( $args );
+	$query = new BookLinksQuery( $args );
 
 	return absint( $query->found_items );
 
@@ -134,7 +138,7 @@ function add_book_link( $args = array() ) {
 		throw new Exception( 'missing_required_parameter', __( 'A url is required.', 'book-database' ), 400 );
 	}
 
-	$query   = new Book_Links_Query();
+	$query   = new BookLinksQuery();
 	$link_id = $query->add_item( $args );
 
 	if ( empty( $link_id ) ) {
@@ -156,7 +160,7 @@ function add_book_link( $args = array() ) {
  */
 function update_book_link( $link_id, $args = array() ) {
 
-	$query   = new Book_Links_Query();
+	$query   = new BookLinksQuery();
 	$updated = $query->update_item( $link_id, $args );
 
 	if ( ! $updated ) {
@@ -177,7 +181,7 @@ function update_book_link( $link_id, $args = array() ) {
  */
 function delete_book_link( $link_id ) {
 
-	$query   = new Book_Links_Query();
+	$query   = new BookLinksQuery();
 	$deleted = $query->delete_item( $link_id );
 
 	if ( ! $deleted ) {
@@ -186,4 +190,4 @@ function delete_book_link( $link_id ) {
 
 	return true;
 
-}
\ No newline at end of file
+}
diff --git a/includes/book-links/class-book-link.php b/includes/book-links/class-book-link.php
deleted file mode 100644
index 61d60e68..00000000
--- a/includes/book-links/class-book-link.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * Book Link Object
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Link
- * @package Book_Database
- */
-class Book_Link extends Base_Object {
-
-	/**
-	 * @var int ID of the associated book.
-	 */
-	protected $book_id = 0;
-
-	/**
-	 * @var int ID of the retailer.
-	 */
-	protected $retailer_id = 0;
-
-	/**
-	 * @var string
-	 */
-	protected $url = '';
-
-	/**
-	 * Get the ID of the associated book.
-	 *
-	 * @return int
-	 */
-	public function get_book_id() {
-		return absint( $this->book_id );
-	}
-
-	/**
-	 * Get the ID of the retailer
-	 *
-	 * @return int
-	 */
-	public function get_retailer_id() {
-		return absint( $this->retailer_id );
-	}
-
-	/**
-	 * Get the URL
-	 *
-	 * @return string
-	 */
-	public function get_url() {
-		return $this->url;
-	}
-
-	/**
-	 * Format the book link
-	 *
-	 * @return string
-	 */
-	public function format() {
-
-		$retailer = get_retailer( $this->get_retailer_id() );
-
-		if ( $retailer instanceof Retailer ) {
-			$html = $retailer->build_link( $this->get_url() );
-		} else {
-			$html = make_clickable( $this->get_url() );
-		}
-
-		/**
-		 * Filters the formatted book link
-		 *
-		 * @param string    $html     Final HTML to be displayed in the book layout.
-		 * @param Retailer  $retailer Retailer object.
-		 * @param Book_Link $this     Book link object.
-		 */
-		return apply_filters( 'book-database/book-link/format', $html, $retailer, $this );
-
-	}
-
-}
\ No newline at end of file
diff --git a/includes/book-taxonomies/book-taxonomy-functions.php b/includes/book-taxonomies/book-taxonomy-functions.php
index 80e0cb7c..b89b06ee 100644
--- a/includes/book-taxonomies/book-taxonomy-functions.php
+++ b/includes/book-taxonomies/book-taxonomy-functions.php
@@ -9,16 +9,20 @@
 
 namespace Book_Database;
 
+use Book_Database\Database\BookTaxonomies\BookTaxonomiesQuery;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Models\BookTaxonomy;
+
 /**
  * Get a single taxonomy by its ID
  *
  * @param int $taxonomy_id
  *
- * @return Book_Taxonomy|false
+ * @return BookTaxonomy|false
  */
 function get_book_taxonomy( $taxonomy_id ) {
 
-	$query = new Book_Taxonomies_Query();
+	$query = new BookTaxonomiesQuery();
 
 	return $query->get_item( $taxonomy_id );
 
@@ -30,11 +34,11 @@ function get_book_taxonomy( $taxonomy_id ) {
  * @param string $column_name
  * @param mixed  $column_value
  *
- * @return Book_Taxonomy|false
+ * @return BookTaxonomy|false
  */
 function get_book_taxonomy_by( $column_name, $column_value ) {
 
-	$query = new Book_Taxonomies_Query();
+	$query = new BookTaxonomiesQuery();
 
 	return $query->get_item_by( $column_name, $column_value );
 
@@ -72,7 +76,7 @@ function get_book_taxonomy_by( $column_name, $column_value ) {
  * @type bool         $update_cache        Whether to prime the cache for found items. Default false.
  * }
  *
- * @return Book_Taxonomy[]|array Array of Book_Taxonomy objects.
+ * @return BookTaxonomy[]|array Array of Book_Taxonomy objects.
  */
 function get_book_taxonomies( $args = array() ) {
 
@@ -80,7 +84,7 @@ function get_book_taxonomies( $args = array() ) {
 		'number' => 20
 	) );
 
-	$query = new Book_Taxonomies_Query();
+	$query = new BookTaxonomiesQuery();
 
 	return $query->query( $args );
 
@@ -101,7 +105,7 @@ function count_book_taxonomies( $args = array() ) {
 		'count' => true
 	) );
 
-	$query = new Book_Taxonomies_Query( $args );
+	$query = new BookTaxonomiesQuery( $args );
 
 	return absint( $query->found_items );
 
@@ -139,7 +143,7 @@ function add_book_taxonomy( $args ) {
 	$args['slug']    = sanitize_key( $args['slug'] );
 	$args['display'] = sanitize_text_field( wp_strip_all_tags( $args['display'] ) );
 
-	$query       = new Book_Taxonomies_Query();
+	$query       = new BookTaxonomiesQuery();
 	$taxonomy_id = $query->add_item( $args );
 
 	if ( empty( $taxonomy_id ) ) {
@@ -166,7 +170,7 @@ function update_book_taxonomy( $taxonomy_id, $args = array() ) {
 		throw new Exception( 'invalid_parameter', __( 'Taxonomy slugs cannot be changed.', 'book-database' ), 400 );
 	}
 
-	$query   = new Book_Taxonomies_Query();
+	$query   = new BookTaxonomiesQuery();
 	$updated = $query->update_item( $taxonomy_id, $args );
 
 	if ( ! $updated ) {
@@ -205,7 +209,7 @@ function delete_book_taxonomy( $taxonomy_id ) {
 		throw new Exception( 'protected_taxonomy', sprintf( __( 'The %s taxonomy cannot be deleted.', 'book-database' ), $taxonomy->get_slug() ), 400 );
 	}
 
-	$query   = new Book_Taxonomies_Query();
+	$query   = new BookTaxonomiesQuery();
 	$deleted = $query->delete_item( $taxonomy_id );
 
 	if ( ! $deleted ) {
@@ -214,4 +218,4 @@ function delete_book_taxonomy( $taxonomy_id ) {
 
 	return true;
 
-}
\ No newline at end of file
+}
diff --git a/includes/book-taxonomies/class-book-taxonomy.php b/includes/book-taxonomies/class-book-taxonomy.php
deleted file mode 100644
index 348ea64e..00000000
--- a/includes/book-taxonomies/class-book-taxonomy.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Book Taxonomy Object
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Taxonomy
- * @package Book_Database
- */
-class Book_Taxonomy extends Base_Object {
-
-	protected $name = '';
-
-	protected $slug = '';
-
-	protected $format = 'text';
-
-	/**
-	 * Get the name
-	 *
-	 * @return string
-	 */
-	public function get_name() {
-		return $this->name;
-	}
-
-	/**
-	 * Get the slug
-	 *
-	 * @return string
-	 */
-	public function get_slug() {
-		return $this->slug;
-	}
-
-	/**
-	 * Get the format - either `text` or `checkbox`
-	 *
-	 * @return string
-	 */
-	public function get_format() {
-		return $this->format;
-	}
-
-}
\ No newline at end of file
diff --git a/includes/book-term-relationships/book-term-relationship-functions.php b/includes/book-term-relationships/book-term-relationship-functions.php
index 7c4bc490..450f3848 100644
--- a/includes/book-term-relationships/book-term-relationship-functions.php
+++ b/includes/book-term-relationships/book-term-relationship-functions.php
@@ -9,16 +9,21 @@
 
 namespace Book_Database;
 
+use Book_Database\Database\BookTerm\BookTermRelationshipQuery;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Models\BookTerm;
+use Book_Database\Models\BookTermRelationship;
+
 /**
  * Get a single book-term-relationship by its ID
  *
  * @param int $relationship_id
  *
- * @return Book_Term_Relationship|false
+ * @return BookTermRelationship|false
  */
 function get_book_term_relationship( $relationship_id ) {
 
-	$query = new Book_Term_Relationships_Query();
+	$query = new BookTermRelationshipQuery();
 
 	return $query->get_item( $relationship_id );
 
@@ -31,7 +36,7 @@ function get_book_term_relationship( $relationship_id ) {
  * @param int   $term_id ID of the term.
  * @param array $args    Query arguments to override the defaults.
  *
- * @return Book_Term_Relationship|false|mixed
+ * @return BookTermRelationship|false|mixed
  */
 function get_book_term_relationship_by_book_and_term( $book_id, $term_id, $args = array() ) {
 
@@ -79,7 +84,7 @@ function get_book_term_relationship_by_book_and_term( $book_id, $term_id, $args
  * @type bool         $update_cache        Whether to prime the cache for found items. Default false.
  * }
  *
- * @return Book_Term_Relationship[] Array of Book_Term_Relationship objects.
+ * @return BookTermRelationship[] Array of Book_Term_Relationship objects.
  */
 function get_book_term_relationships( $args = array() ) {
 
@@ -87,7 +92,7 @@ function get_book_term_relationships( $args = array() ) {
 		'number' => 20
 	) );
 
-	$query = new Book_Term_Relationships_Query();
+	$query = new BookTermRelationshipQuery();
 
 	return $query->query( $args );
 
@@ -108,7 +113,7 @@ function count_book_term_relationships( $args = array() ) {
 		'count' => true
 	) );
 
-	$query = new Book_Term_Relationships_Query( $args );
+	$query = new BookTermRelationshipQuery( $args );
 
 	return absint( $query->found_items );
 
@@ -141,7 +146,7 @@ function add_book_term_relationship( $args ) {
 		throw new Exception( 'missing_required_parameter', __( 'A book ID is required.', 'book-database' ), 400 );
 	}
 
-	$query           = new Book_Term_Relationships_Query();
+	$query           = new BookTermRelationshipQuery();
 	$relationship_id = $query->add_item( $args );
 
 	if ( empty( $relationship_id ) ) {
@@ -175,11 +180,11 @@ function delete_book_term_relationship( $relationship_id ) {
 
 	$relationship = get_book_term_relationship( $relationship_id );
 
-	if ( ! $relationship instanceof Book_Term_Relationship ) {
+	if ( ! $relationship instanceof BookTermRelationship ) {
 		return true;
 	}
 
-	$query   = new Book_Term_Relationships_Query();
+	$query   = new BookTermRelationshipQuery();
 	$deleted = $query->delete_item( $relationship_id );
 
 	if ( ! $deleted ) {
@@ -212,7 +217,7 @@ function delete_book_term_relationship( $relationship_id ) {
  * @type string  $fields   Column names to return.
  * }
  *
- * @return Book_Term[]|array
+ * @return BookTerm[]|array
  */
 function get_attached_book_terms( $book_id, $taxonomy, $args = array() ) {
 
@@ -267,7 +272,7 @@ function get_attached_book_terms( $book_id, $taxonomy, $args = array() ) {
 
 		if ( is_array( $objects ) ) {
 			foreach ( $objects as $object ) {
-				$terms[] = new Book_Term( $object );
+				$terms[] = new BookTerm( $object );
 			}
 		}
 	} elseif ( in_array( $args['fields'], array( 'id', 'ids', 'name', 'names' ) ) ) {
@@ -378,4 +383,4 @@ function set_book_terms( $book_id, $terms, $taxonomy, $append = false ) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/book-term-relationships/class-book-term-relationship.php b/includes/book-term-relationships/class-book-term-relationship.php
deleted file mode 100644
index 40474d69..00000000
--- a/includes/book-term-relationships/class-book-term-relationship.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Book Term Relationship Object
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Term_Relationship
- * @package Book_Database
- */
-class Book_Term_Relationship extends Base_Object {
-
-	protected $term_id = 0;
-
-	protected $book_id = 0;
-
-	/**
-	 * Get the term ID
-	 *
-	 * @return int
-	 */
-	public function get_term_id() {
-		return absint( $this->term_id );
-	}
-
-	/**
-	 * Get the book ID
-	 *
-	 * @return int
-	 */
-	public function get_book_id() {
-		return absint( $this->book_id );
-	}
-
-}
\ No newline at end of file
diff --git a/includes/book-terms/book-term-functions.php b/includes/book-terms/book-term-functions.php
index 2a7e1afa..fbeb65b4 100644
--- a/includes/book-terms/book-term-functions.php
+++ b/includes/book-terms/book-term-functions.php
@@ -9,16 +9,20 @@
 
 namespace Book_Database;
 
+use Book_Database\Database\BookTerms\BookTermsQuery;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Models\BookTerm;
+
 /**
  * Get a single book term by its ID
  *
  * @param int $term_id
  *
- * @return Book_Term|false
+ * @return BookTerm|false
  */
 function get_book_term( $term_id ) {
 
-	$query = new Book_Terms_Query();
+	$query = new BookTermsQuery();
 
 	return $query->get_item( $term_id );
 
@@ -30,11 +34,11 @@ function get_book_term( $term_id ) {
  * @param string $column_name
  * @param mixed  $column_value
  *
- * @return Book_Term|false
+ * @return BookTerm|false
  */
 function get_book_term_by( $column_name, $column_value ) {
 
-	$query = new Book_Terms_Query();
+	$query = new BookTermsQuery();
 
 	return $query->get_item_by( $column_name, $column_value );
 
@@ -46,7 +50,7 @@ function get_book_term_by( $column_name, $column_value ) {
  * @param string $term_name Term name.
  * @param string $taxonomy  Taxonomy slug.
  *
- * @return Book_Term|false
+ * @return BookTerm|false
  */
 function get_book_term_by_name_and_taxonomy( $term_name, $taxonomy, $args = array() ) {
 
@@ -99,7 +103,7 @@ function get_book_term_by_name_and_taxonomy( $term_name, $taxonomy, $args = arra
  * @type bool         $update_cache        Whether to prime the cache for found items. Default false.
  * }
  *
- * @return Book_Term[] Array of Book_Term objects.
+ * @return BookTerm[] Array of Book_Term objects.
  */
 function get_book_terms( $args = array() ) {
 
@@ -107,7 +111,7 @@ function get_book_terms( $args = array() ) {
 		'number' => 20
 	) );
 
-	$query = new Book_Terms_Query();
+	$query = new BookTermsQuery();
 
 	return $query->query( $args );
 
@@ -128,7 +132,7 @@ function count_book_terms( $args = array() ) {
 		'count' => true
 	) );
 
-	$query = new Book_Terms_Query( $args );
+	$query = new BookTermsQuery( $args );
 
 	return absint( $query->found_items );
 
@@ -175,7 +179,7 @@ function add_book_term( $args ) {
 	// Generate a slug.
 	$args['slug'] = ! empty( $args['slug'] ) ? unique_book_slug( $args['slug'], $args['taxonomy'] ) : unique_book_slug( sanitize_title( $args['name'], $args['taxonomy'] ) );
 
-	$query   = new Book_Terms_Query();
+	$query   = new BookTermsQuery();
 	$term_id = $query->add_item( $args );
 
 	if ( empty( $term_id ) ) {
@@ -210,7 +214,7 @@ function update_book_term( $term_id, $args = array() ) {
 		$args['slug'] = unique_book_slug( $args['slug'], $term->get_taxonomy() );
 	}
 
-	$query   = new Book_Terms_Query();
+	$query   = new BookTermsQuery();
 	$updated = $query->update_item( $term_id, $args );
 
 	if ( ! $updated ) {
@@ -233,7 +237,7 @@ function update_book_term( $term_id, $args = array() ) {
  */
 function delete_book_term( $term_id ) {
 
-	$query   = new Book_Terms_Query();
+	$query   = new BookTermsQuery();
 	$deleted = $query->delete_item( $term_id );
 
 	if ( ! $deleted ) {
@@ -300,4 +304,4 @@ function get_book_terms_admin_page_url( $args = array() ) {
 
 	return add_query_arg( $sanitized_args, admin_url( 'admin.php?page=bdb-terms' ) );
 
-}
\ No newline at end of file
+}
diff --git a/includes/book-terms/class-book-term.php b/includes/book-terms/class-book-term.php
deleted file mode 100644
index 5399c29d..00000000
--- a/includes/book-terms/class-book-term.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Book Term
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Term
- * @package Book_Database
- */
-class Book_Term extends Base_Object {
-
-	protected $taxonomy = '';
-
-	protected $name = '';
-
-	protected $slug = '';
-
-	protected $description = '';
-
-	protected $image_id = 0;
-
-	protected $links = '';
-
-	protected $book_count = 0;
-
-	/**
-	 * Get the taxonomy slug
-	 *
-	 * @return string
-	 */
-	public function get_taxonomy() {
-		return $this->taxonomy;
-	}
-
-	/**
-	 * Get the name of the term
-	 *
-	 * @return string
-	 */
-	public function get_name() {
-		return $this->name;
-	}
-
-	/**
-	 * Get the term slug
-	 *
-	 * @return string
-	 */
-	public function get_slug() {
-		return $this->slug;
-	}
-
-	/**
-	 * Get the description
-	 *
-	 * @return string
-	 */
-	public function get_description() {
-		return $this->description;
-	}
-
-	/**
-	 * Get the ID of the image attachment
-	 *
-	 * @return int
-	 */
-	public function get_image_id() {
-		return absint( $this->image_id );
-	}
-
-	/**
-	 * Get the term links
-	 *
-	 * @return string
-	 */
-	public function get_links() {
-		return $this->links;
-	}
-
-	/**
-	 * Get the number of books associated with this term
-	 *
-	 * @return int
-	 */
-	public function get_book_count() {
-		return absint( $this->book_count );
-	}
-
-}
\ No newline at end of file
diff --git a/includes/books/book-functions.php b/includes/books/book-functions.php
index c0a33dff..65d4d199 100644
--- a/includes/books/book-functions.php
+++ b/includes/books/book-functions.php
@@ -9,6 +9,10 @@
 
 namespace Book_Database;
 
+use Book_Database\Database\Books\BooksQuery;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Models\Book;
+
 /**
  * Get a single book by its ID
  *
@@ -18,7 +22,7 @@
  */
 function get_book( $book_id ) {
 
-	$query = new Books_Query();
+	$query = new BooksQuery();
 
 	return $query->get_item( $book_id );
 
@@ -34,7 +38,7 @@ function get_book( $book_id ) {
  */
 function get_book_by( $column_name, $column_value ) {
 
-	$query = new Books_Query();
+	$query = new BooksQuery();
 
 	return $query->get_item_by( $column_name, $column_value );
 
@@ -44,7 +48,8 @@ function get_book_by( $column_name, $column_value ) {
  * Query for books
  *
  * Note: An alternative to this function is Books_Query::get_books().
- * @see Books_Query::get_books()
+ *
+ * @see BooksQuery::get_books()
  *
  * Here's how they differ:
  *
@@ -112,7 +117,7 @@ function get_books( $args = array() ) {
 		'number' => 20
 	) );
 
-	$query = new Books_Query();
+	$query = new BooksQuery();
 
 	return $query->query( $args );
 
@@ -133,7 +138,7 @@ function count_books( $args = array() ) {
 		'count' => true
 	) );
 
-	$query = new Books_Query( $args );
+	$query = new BooksQuery( $args );
 
 	return absint( $query->found_items );
 
@@ -181,7 +186,7 @@ function add_book( $args = array() ) {
 		throw new Exception( 'missing_parameter', __( 'Book title is required.', 'book-database' ), 400 );
 	}
 
-	$query   = new Books_Query();
+	$query   = new BooksQuery();
 	$book_id = $query->add_item( $args );
 
 	if ( empty( $book_id ) ) {
@@ -213,7 +218,7 @@ function add_book( $args = array() ) {
  */
 function update_book( $book_id, $args = array() ) {
 
-	$query   = new Books_Query();
+	$query   = new BooksQuery();
 	$updated = $query->update_item( $book_id, $args );
 
 	if ( ! $updated ) {
@@ -239,7 +244,7 @@ function delete_book( $book_id ) {
 
 	global $wpdb;
 
-	$query   = new Books_Query();
+	$query   = new BooksQuery();
 	$deleted = $query->delete_item( $book_id );
 
 	if ( ! $deleted ) {
@@ -329,4 +334,4 @@ function generate_book_index_title( $original_title ) {
 	 */
 	return apply_filters( 'book-database/book/generate-index-title', $index_title, $original_title );
 
-}
\ No newline at end of file
+}
diff --git a/includes/books/class-book.php b/includes/books/class-book.php
deleted file mode 100644
index de530aed..00000000
--- a/includes/books/class-book.php
+++ /dev/null
@@ -1,351 +0,0 @@
-<?php
-/**
- * Book
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book
- *
- * @package Book_Database
- */
-class Book extends Base_Object {
-
-	protected $cover_id = 0;
-
-	protected $title = '';
-
-	protected $index_title = '';
-
-	protected $authors;
-
-	protected $series_id = null;
-
-	protected $series_position = null;
-
-	protected $pub_date = '';
-
-	protected $pages = 0;
-
-	protected $synopsis = '';
-
-	protected $goodreads_url = '';
-
-	protected $links;
-
-	/**
-	 * Get the attachment ID for the cover image
-	 *
-	 * @return int
-	 */
-	public function get_cover_id() {
-		return absint( $this->cover_id );
-	}
-
-	/**
-	 * Get the cover image URL
-	 *
-	 * @param string $size Desired image size.
-	 *
-	 * @return string
-	 */
-	public function get_cover_url( $size = 'full' ) {
-
-		$url      = '';
-		$cover_id = $this->get_cover_id();
-
-		if ( ! empty( $cover_id ) ) {
-			$url = wp_get_attachment_image_url( $cover_id, $size );
-		}
-
-		return apply_filters( 'book-database/book/get/cover_url', $url, $cover_id, $this );
-
-	}
-
-	/**
-	 * Get the cover image HTML.
-	 *
-	 * @param string|array $size Desired image size.
-	 * @param array        $args Arguments to use in `wp_get_attachment_image()`.
-	 *
-	 * @return string
-	 */
-	public function get_cover( $size = 'full', $args = array() ) {
-
-		$image    = '';
-		$cover_id = $this->get_cover_id();
-
-		if ( $cover_id ) {
-			$image = wp_get_attachment_image( absint( $cover_id ), $size, false, $args );
-		}
-
-		return apply_filters( 'book-database/book/get/cover', $image, $cover_id, $this );
-
-	}
-
-	/**
-	 * Get the title of the book
-	 *
-	 * @return string
-	 */
-	public function get_title() {
-		return $this->title;
-	}
-
-	/**
-	 * Get the index-friendly title
-	 *
-	 * This moves "The", "An", and "A" to the end of the title. Example:
-	 * `Binding, The`
-	 *
-	 * @return string
-	 */
-	public function get_index_title() {
-		return $this->index_title;
-	}
-
-	/**
-	 * Get the authors of the book
-	 *
-	 * This returns an array of `Author` objects.
-	 *
-	 * @param array $args Query args to override the defaults.
-	 *
-	 * @return Author[]|array
-	 */
-	public function get_authors( $args = array() ) {
-
-		if ( ! isset( $this->authors ) ) {
-			$this->authors = get_attached_book_authors( $this->get_id(), $args );
-		}
-
-		return $this->authors;
-
-	}
-
-	/**
-	 * Get the author names
-	 *
-	 * @param bool $implode True to return a comma-separated list, false to return an array.
-	 *
-	 * @return array|string
-	 */
-	public function get_author_names( $implode = false ) {
-
-		$author_names = array();
-		$author_terms = $this->get_authors();
-
-		if ( $author_terms ) {
-			foreach ( $author_terms as $author_term ) {
-				$author_names[] = $author_term->get_name();
-			}
-		}
-
-		if ( $implode ) {
-			$author_names = implode( ', ', $author_names );
-		}
-
-		return $author_names;
-
-	}
-
-	/**
-	 * Get the ID of the series this book is in
-	 *
-	 * @return int|null
-	 */
-	public function get_series_id() {
-		return ! empty( $this->series_id ) ? absint( $this->series_id ) : null;
-	}
-
-	/**
-	 * Get the position in the series
-	 *
-	 * @return int|float|null
-	 */
-	public function get_series_position() {
-		return $this->series_position ?? null;
-	}
-
-	/**
-	 * Get the name of the series
-	 *
-	 * @return string|false Series name on success, false on failure.
-	 */
-	public function get_series_name() {
-
-		$series = get_book_series_by( 'id', $this->get_series_id() );
-
-		if ( $series instanceof Series ) {
-			return $series->get_name();
-		}
-
-		return false;
-
-	}
-
-	/**
-	 * Get the book's publication date
-	 *
-	 * @param bool   $formatted Whether or not to format the result for display.
-	 *                          Unlike other dates, this DOES NOT convert the date
-	 *                          to local time. We keep it in UTC always.
-	 * @param string $format    Format to display in. Defaults to site format.
-	 *
-	 * @return string
-	 */
-	public function get_pub_date( $formatted = false, $format = '' ) {
-
-		if ( empty( $this->pub_date ) || ! $formatted ) {
-			return $this->pub_date;
-		}
-
-		$format = ! empty( $format ) ? $format : get_option( 'date_format' );
-
-		return date( $format, strtotime( $this->pub_date ) );
-
-	}
-
-	/**
-	 * Get the number of pages in the book
-	 *
-	 * @return int
-	 */
-	public function get_pages() {
-		return ! empty( $this->pages ) ? absint( $this->pages ) : null;
-	}
-
-	/**
-	 * Get the synopsis
-	 *
-	 * @return string
-	 */
-	public function get_synopsis() {
-		return $this->synopsis;
-	}
-
-	/**
-	 * Get the Goodreads URL
-	 *
-	 * @return string
-	 */
-	public function get_goodreads_url() {
-		return $this->goodreads_url;
-	}
-
-	/**
-	 * Get the links associated with this book
-	 *
-	 * @return Book_Link[]
-	 */
-	public function get_links() {
-
-		if ( ! isset( $this->links ) ) {
-			$this->links = get_book_links( array(
-				'book_id' => $this->get_id(),
-				'number'  => 30
-			) );
-		}
-
-		return $this->links;
-
-	}
-
-	/**
-	 * Get the average rating from all reading logs associated with this book
-	 *
-	 * @return int|float|null
-	 */
-	public function get_average_rating() {
-
-		global $wpdb;
-
-		$log_table = book_database()->get_table( 'reading_log' )->get_table_name();
-
-		$query   = $wpdb->prepare( "SELECT ROUND( AVG( rating ), 2 ) FROM {$log_table} WHERE book_id = %d AND rating IS NOT NULL", $this->get_id() );
-		$average = $wpdb->get_var( $query );
-
-		/**
-		 * Filters the average rating for a book.
-		 *
-		 * @param int|float|null $average Average rating.
-		 * @param int            $book_id ID of the book.
-		 * @param Book           $this    Book object.
-		 */
-		return apply_filters( 'book-database/book/get/average-rating', $average, $this->get_id(), $this );
-
-	}
-
-	/**
-	 * Whether or not the book has a term attached.
-	 *
-	 * @param string|int $term_name_or_id Term name or ID.
-	 * @param string     $taxonomy        Taxonomy slug.
-	 *
-	 * @return bool
-	 */
-	public function has_term( $term_name_or_id, $taxonomy ) {
-
-		$args = array();
-
-		if ( is_numeric( $term_name_or_id ) ) {
-			$args['fields'] = 'id';
-		} else {
-			$args['fields'] = 'name';
-		}
-
-		$terms = get_attached_book_terms( $this->get_id(), $taxonomy, $args );
-
-		return in_array( $term_name_or_id, $terms );
-
-	}
-
-	/**
-	 * Returns all data associated with a book
-	 *
-	 * @return array
-	 */
-	public function get_data() {
-
-		$data = array(
-			'id'              => $this->get_id(),
-			'cover_id'        => $this->get_cover_id(),
-			'cover_url'       => $this->get_cover_url( 'full' ),
-			'title'           => $this->get_title(),
-			'index_title'     => $this->get_index_title(),
-			'authors'         => $this->get_authors(),
-			'series_id'       => $this->get_series_id(),
-			'series_name'     => $this->get_series_name(),
-			'series_position' => $this->get_series_position(),
-			'pub_date'        => $this->get_pub_date(),
-			'pages'           => $this->get_pages(),
-			'synopsis'        => $this->get_synopsis(),
-			'goodreads_url'   => $this->get_goodreads_url(),
-			'links'           => $this->get_links(),
-			'terms'           => array(),
-			'date_created'    => $this->get_date_created(),
-			'date_modified'   => $this->get_date_modified()
-		);
-
-		// Attach all terms.
-		foreach ( get_book_taxonomies( array( 'field' => 'slug' ) ) as $taxonomy ) {
-			$data['terms'][ $taxonomy ] = get_attached_book_terms( $this->get_id(), $taxonomy );
-		}
-
-		/**
-		 * Filters the data.
-		 *
-		 * @param array $data
-		 * @param int   $book_id
-		 * @param Book  $this
-		 */
-		return apply_filters( 'book-database/book/get/data', $data, $this->get_id(), $this );
-
-	}
-
-}
\ No newline at end of file
diff --git a/includes/capabilities.php b/includes/capabilities.php
index 6ce8ea6f..893ad9bd 100644
--- a/includes/capabilities.php
+++ b/includes/capabilities.php
@@ -3,7 +3,7 @@
  * Capabilities
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
@@ -15,7 +15,7 @@
  * @since 1.0
  * @return array
  */
-function get_book_capabilities() {
+function get_book_capabilities(): array {
 	return array(
 		'bdb_view_books',
 		'bdb_edit_books',
@@ -26,89 +26,86 @@ function get_book_capabilities() {
 /**
  * Returns true if the user can view books in the admin area
  *
- * @param int $user_id
+ * @param  int  $user_id
  *
  * @return bool
  */
-function user_can_view_books( $user_id = 0 ) {
-
-	if ( empty( $user_id ) ) {
-		$user_id = get_current_user_id();
-	}
-
-	$can_view = user_can( $user_id, 'bdb_view_books' );
-
-	// Admins can always view.
-	if ( ! $can_view && user_can( $user_id, 'manage_options' ) ) {
-		$can_view = true;
-	}
-
-	/**
-	 * Filters whether or not a user is allowed to view books in the admin area.
-	 *
-	 * @param bool $can_view
-	 * @param int  $user_id
-	 */
-	return apply_filters( 'book-database/capabilities/view-books', $can_view, $user_id );
-
+function user_can_view_books(int $user_id = 0): bool
+{
+    if (empty($user_id)) {
+        $user_id = get_current_user_id();
+    }
+
+    $can_view = user_can($user_id, 'bdb_view_books');
+
+    // Admins can always view.
+    if (! $can_view && user_can($user_id, 'manage_options')) {
+        $can_view = true;
+    }
+
+    /**
+     * Filters whether or not a user is allowed to view books in the admin area.
+     *
+     * @param  bool  $can_view
+     * @param  int  $user_id
+     */
+    return apply_filters('book-database/capabilities/view-books', $can_view, $user_id);
 }
 
 /**
  * Returns true if the user can edit books in the admin area
  *
- * @param int $user_id
+ * @param  int  $user_id
  *
  * @return bool
  */
-function user_can_edit_books( $user_id = 0 ) {
-
-	if ( empty( $user_id ) ) {
-		$user_id = get_current_user_id();
-	}
-
-	$can_edit = user_can( $user_id, 'bdb_edit_books' );
-
-	// Admins can always edit.
-	if ( ! $can_edit && user_can( $user_id, 'manage_options' ) ) {
-		$can_edit = true;
-	}
-
-	/**
-	 * Filters whether or not a user is allowed to edit books in the admin area.
-	 *
-	 * @param bool $can_view
-	 * @param int  $user_id
-	 */
-	return apply_filters( 'book-database/capabilities/edit-books', $can_edit, $user_id );
-
+function user_can_edit_books(int $user_id = 0): bool
+{
+    if (empty($user_id)) {
+        $user_id = get_current_user_id();
+    }
+
+    $can_edit = user_can($user_id, 'bdb_edit_books');
+
+    // Admins can always edit.
+    if (! $can_edit && user_can($user_id, 'manage_options')) {
+        $can_edit = true;
+    }
+
+    /**
+     * Filters whether or not a user is allowed to edit books in the admin area.
+     *
+     * @param  bool  $can_view
+     * @param  int  $user_id
+     */
+    return apply_filters('book-database/capabilities/edit-books', $can_edit, $user_id);
 }
 
 /**
  * Returns true if the user can manage the BDB settings
  *
- * @param int $user_id
+ * @param  int  $user_id
  *
  * @return bool
  */
-function user_can_manage_book_settings( $user_id = 0 ) {
-
-	if ( empty( $user_id ) ) {
-		$user_id = get_current_user_id();
-	}
-
-	$can_manage = user_can( $user_id, 'bdb_manage_book_settings' );
-
-	// Admins can always edit.
-	if ( ! $can_manage && user_can( $user_id, 'manage_options' ) ) {
-		$can_manage = true;
-	}
-
-	/**
-	 * Filters whether or not a user is allowed to manage BDB settings.
-	 *
-	 * @param bool $can_view
-	 * @param int  $user_id
-	 */
-	return apply_filters( 'book-database/capabilities/manage-book-settings', $can_manage, $user_id );
-
-}
\ No newline at end of file
+function user_can_manage_book_settings(int $user_id = 0): bool
+{
+    if (empty($user_id)) {
+        $user_id = get_current_user_id();
+    }
+
+    $can_manage = user_can($user_id, 'bdb_manage_book_settings');
+
+    // Admins can always edit.
+    if (! $can_manage && user_can($user_id, 'manage_options')) {
+        $can_manage = true;
+    }
+
+    /**
+     * Filters whether or not a user is allowed to manage BDB settings.
+     *
+     * @param  bool  $can_view
+     * @param  int  $user_id
+     */
+    return apply_filters('book-database/capabilities/manage-book-settings', $can_manage, $user_id);
+}
diff --git a/includes/class-analytics.php b/includes/class-analytics.php
deleted file mode 100644
index 2af7d44c..00000000
--- a/includes/class-analytics.php
+++ /dev/null
@@ -1,685 +0,0 @@
-<?php
-/**
- * Reading & Review Analytics
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Analytics
- * @package Book_Database
- */
-class Analytics {
-
-	/**
-	 * @var string Start date.
-	 */
-	protected $start_date = '';
-
-	/**
-	 * @var string End date.
-	 */
-	protected $end_date = '';
-
-	/**
-	 * @var array Arguments.
-	 */
-	protected $args = array();
-
-	/**
-	 * @var \wpdb
-	 */
-	protected $wpdb;
-
-	/**
-	 * @var array Database table names.
-	 */
-	protected $tables = array();
-
-	/**
-	 * @var null|array
-	 */
-	protected $number_books_read_breakdown = null;
-
-	/**
-	 * Reviews written during this period
-	 *
-	 * @var null|int
-	 */
-	protected $reviews = null;
-
-	/**
-	 * Analytics constructor.
-	 *
-	 * @param string $start_date
-	 * @param string $end_date
-	 */
-	public function __construct( $start_date, $end_date, $args = array() ) {
-
-		global $wpdb;
-
-		$this->start_date = $start_date;
-		$this->end_date   = $end_date;
-		$this->args       = wp_parse_args( $args, array(
-			'rating_format' => null
-		) );
-		$this->wpdb       = $wpdb;
-		$this->tables     = array(
-			'authors'     => book_database()->get_table( 'authors' )->get_table_name(),
-			'author_r'    => book_database()->get_table( 'book_author_relationships' )->get_table_name(),
-			'term_r'      => book_database()->get_table( 'book_term_relationships' )->get_table_name(),
-			'book_terms'  => book_database()->get_table( 'book_terms' )->get_table_name(),
-			'books'       => book_database()->get_table( 'books' )->get_table_name(),
-			'editions'    => book_database()->get_table( 'editions' )->get_table_name(),
-			'reading_log' => book_database()->get_table( 'reading_log' )->get_table_name(),
-			'reviews'     => book_database()->get_table( 'reviews' )->get_table_name(),
-			'series'      => book_database()->get_table( 'series' )->get_table_name(),
-		);
-
-	}
-
-	/**
-	 * Log the performed query
-	 *
-	 * This only actually logs if WP_DEBUG is enabled.
-	 *
-	 * @param string $query  MySQL query.
-	 * @param string $method Method name.
-	 */
-	protected function log( $query, $method ) {
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-			error_log( sprintf( "%s:\n%s", $method, $query ) );
-		}
-	}
-
-	/**
-	 * Get a breakdown of how books were read
-	 *
-	 * Returns an array of `finished`, `dnf`, `rereads`, and `new`.
-	 *
-	 * @see Analytics\Books_Finished_Count
-	 * @see Analytics\Books_DNF_Count
-	 *
-	 * @return array
-	 */
-	public function get_number_books_read_breakdown() {
-
-		if ( is_array( $this->number_books_read_breakdown ) ) {
-			return $this->number_books_read_breakdown;
-		}
-
-		$counts = array(
-			'finished' => 0,
-			'dnf'      => 0,
-			'rereads'  => 0,
-			'new'      => 0
-		);
-
-		/**
-		 * Number of books finished.
-		 */
-		$query = $this->wpdb->prepare(
-			"SELECT COUNT(*) FROM {$this->tables['reading_log']}
-				WHERE date_finished >= %s
-            	AND date_finished <= %s
-                AND date_finished IS NOT NULL
-                AND percentage_complete >= 1",
-			$this->start_date, $this->end_date
-		);
-
-		$this->log( $query, __METHOD__ . '\finished' );
-
-		$counts['finished'] = absint( $this->wpdb->get_var( $query ) );
-
-		/**
-		 * Number of books DNF
-		 */
-		$query = $this->wpdb->prepare(
-			"SELECT COUNT(*)
-				FROM {$this->tables['reading_log']}
-				WHERE date_started >= %s
-				AND date_finished <= %s
-				AND date_finished IS NOT NULL
-				AND percentage_complete < 1",
-			$this->start_date,
-			$this->end_date
-		);
-
-		$this->log( $query, __METHOD__ . '\dnf' );
-
-		$counts['dnf'] = absint( $this->wpdb->get_var( $query ) );
-
-		/**
-		 * Count rereads
-		 */
-		$query = $this->wpdb->prepare(
-			"SELECT ( COUNT(*) - 1 ) AS count, GROUP_CONCAT( date_finished SEPARATOR ',' ) AS date_finished, book_id
-				FROM {$this->tables['reading_log']} AS log
-				INNER JOIN {$this->tables['books']} AS book ON book.id = log.book_id
-				WHERE `date_finished` < %s
-				AND `date_finished` IS NOT NULL 
-				GROUP BY book_id",
-			$this->end_date
-		);
-
-		$this->log( $query, __METHOD__ . '\rereads' );
-
-		$books_read = $this->wpdb->get_results( $query );
-
-		if ( ! empty( $books_read ) ) {
-			foreach ( $books_read as $book_read ) {
-				if ( $book_read->count < 1 ) {
-					continue;
-				}
-
-				$dates_finished    = explode( ',', $book_read->date_finished );
-				$this_book_rereads = 0;
-
-				foreach ( $dates_finished as $date_finished ) {
-					if ( $date_finished >= $this->start_date && $date_finished <= $this->end_date ) {
-						$this_book_rereads ++;
-					}
-
-					if ( $this_book_rereads >= $book_read->count ) {
-						break;
-					}
-				}
-
-				$counts['rereads'] += $this_book_rereads;
-			}
-		}
-
-		$counts['new'] = ( $counts['finished'] + $counts['dnf'] ) - $counts['rereads'];
-
-		return $counts;
-
-	}
-
-	/**
-	 * Returns the number of books that have been fully read/finished.
-	 *
-	 * @return int
-	 */
-	public function get_number_books_finished() {
-
-		$breakdown = $this->get_number_books_read_breakdown();
-
-		return absint( $breakdown['finished'] );
-
-	}
-
-	/**
-	 * Returns the number of books that were marked as DNF
-	 *
-	 * @return int
-	 */
-	public function get_number_dnf() {
-
-		$breakdown = $this->get_number_books_read_breakdown();
-
-		return absint( $breakdown['dnf'] );
-
-	}
-
-	/**
-	 * Get the number of new books that were read
-	 *
-	 * @return int
-	 */
-	public function get_number_new_books() {
-
-		$breakdown = $this->get_number_books_read_breakdown();
-
-		return absint( $breakdown['new'] );
-
-	}
-
-	/**
-	 * Get the number of rereads
-	 *
-	 * @return int
-	 */
-	public function get_number_rereads() {
-
-		$breakdown = $this->get_number_books_read_breakdown();
-
-		return absint( $breakdown['rereads'] );
-
-	}
-
-	/**
-	 * Get the number of pages read
-	 *
-	 * @see Analytics\Pages_Read
-	 *
-	 * @return int
-	 */
-	public function get_number_pages_read() {
-
-		$query = $this->wpdb->prepare(
-			"SELECT SUM(pages * percentage_complete) as pages_read
-				FROM {$this->tables['books']} AS book
-				INNER JOIN {$this->tables['reading_log']} AS log ON( log.book_id = book.id )
-				WHERE date_finished >= %s
-				AND date_finished <= %s
-				AND date_finished IS NOT NULL",
-			$this->start_date, $this->end_date
-		);
-
-		$this->log( $query, __METHOD__ );
-
-		$result = $this->wpdb->get_var( $query );
-
-		return round( absint( $result ) );
-
-	}
-
-	/**
-	 * Calculate the number of books on track to be read in a given period
-	 *
-	 * @return int
-	 */
-	public function get_reading_track() {
-
-		try {
-
-			$books_read = $this->get_number_books_finished();
-
-			// If end date is in the past, return books read.
-			if ( time() > strtotime( $this->end_date ) ) {
-				return $books_read;
-			}
-
-			$now        = new \DateTime();
-			$start_date = new \DateTime( $this->start_date );
-			$end_date   = new \DateTime( $this->end_date );
-
-			// Calculate books read per day so far.
-			$days_in_period = $now->diff( $start_date )->days;
-			$books_per_day  = ( $days_in_period > 0 ) ? $books_read / $days_in_period : 0;
-
-			// Based on books per day, calculate how many we'll read in the remaining days.
-			$remaining_days = $end_date->diff( $now )->days;
-			$left_to_read   = $books_per_day * $remaining_days;
-
-			return round( $left_to_read + $books_read );
-
-		} catch ( \Exception $e ) {
-			return null;
-		}
-
-	}
-
-	/**
-	 * Query for reviews written during this period
-	 *
-	 * @return object[]
-	 */
-	public function query_reviews() {
-
-		if ( ! is_null( $this->reviews ) ) {
-			return $this->reviews;
-		}
-
-		$query = $this->wpdb->prepare(
-			"SELECT DISTINCT review.id, review.date_written, log.rating AS rating, book.id AS book_id, book.title AS book_title, GROUP_CONCAT(author.name SEPARATOR ', ') AS author_name
-				FROM {$this->tables['reviews']} AS review 
-				LEFT JOIN {$this->tables['reading_log']} AS log ON ( review.reading_log_id = log.id )
-				INNER JOIN {$this->tables['books']} AS book ON ( review.book_id = book.id )
-				LEFT JOIN {$this->tables['author_r']} AS ar ON ( book.id = ar.book_id )
-				INNER JOIN {$this->tables['authors']} AS author ON ( ar.author_id = author.id )
-				WHERE date_written >= %s 
-				AND date_written <= %s 
-				GROUP BY book.id
-				ORDER BY review.date_written DESC",
-			$this->start_date,
-			$this->end_date
-		);
-
-		$this->log( $query, __METHOD__ );
-
-		$this->reviews = $this->wpdb->get_results( $query );
-
-		return $this->reviews;
-
-	}
-
-	/**
-	 * Get the number of reviews
-	 *
-	 * @return int
-	 */
-	public function get_number_reviews() {
-
-		$reviews = $this->query_reviews();
-
-		return is_array( $reviews ) ? count( $reviews ) : 0;
-
-	}
-
-	/**
-	 * Get the average star rating
-	 *
-	 * @return float|int
-	 */
-	public function get_avg_rating() {
-
-		$query = $this->wpdb->prepare(
-			"SELECT ROUND( AVG( rating ), 2 )
-			FROM {$this->tables['reading_log']}
-			WHERE rating IS NOT NULL 
-			AND date_finished >= %s 
-			AND date_finished <= %s 
-			AND date_finished IS NOT NULL",
-			$this->start_date,
-			$this->end_date
-		);
-
-		$this->log( $query, __METHOD__ );
-
-		$average = $this->wpdb->get_var( $query );
-
-		return $average * 1;
-
-	}
-
-	/**
-	 * Count the number of different series read
-	 *
-	 * @return int
-	 */
-	public function get_number_different_series() {
-
-		$query = $this->wpdb->prepare(
-			"SELECT COUNT( DISTINCT series_id )
-			FROM {$this->tables['reading_log']} AS log 
-			INNER JOIN {$this->tables['books']} AS book ON ( book.id = log.book_id )
-			WHERE date_finished >= %s 
-			AND date_finished <= %s 
-			AND date_finished IS NOT NULL 
-			AND series_id IS NOT NULL",
-			$this->start_date,
-			$this->end_date
-		);
-
-		$this->log( $query, __METHOD__ );
-
-		$number = $this->wpdb->get_var( $query );
-
-		return absint( $number );
-
-	}
-
-	/**
-	 * Count the number of standalones read
-	 *
-	 * @return int
-	 */
-	public function get_number_standalones() {
-
-		$query = $this->wpdb->prepare(
-			"SELECT COUNT(*)
-			FROM {$this->tables['reading_log']} AS log 
-			INNER JOIN {$this->tables['books']} AS book ON ( book.id = log.book_id )
-			WHERE date_finished >= %s 
-			AND date_finished <= %s 
-			AND date_finished IS NOT NULL 
-			AND series_id IS NULL",
-			$this->start_date,
-			$this->end_date
-		);
-
-		$this->log( $query, __METHOD__ );
-
-		$number = $this->wpdb->get_var( $query );
-
-		return absint( $number );
-
-	}
-
-	/**
-	 * Get the number of different authors
-	 *
-	 * @return int
-	 */
-	public function get_number_authors() {
-
-		$query = $this->wpdb->prepare(
-			"SELECT COUNT( DISTINCT ar.author_id )
-			FROM {$this->tables['author_r']} AS ar 
-			INNER JOIN {$this->tables['reading_log']} AS log ON ( ar.book_id = log.book_id )
-			WHERE date_finished >= %s 
-			AND date_finished <= %s 
-			AND date_finished IS NOT NULL",
-			$this->start_date,
-			$this->end_date
-		);
-
-		$this->log( $query, __METHOD__ );
-
-		$number = $this->wpdb->get_var( $query );
-
-		return absint( $number );
-
-	}
-
-	/**
-	 * Get rating breakdown
-	 *
-	 * Returns an array of arrays, containing each available rating and the associated number of books.
-	 */
-	public function get_rating_breakdown() {
-
-		$query = $this->wpdb->prepare(
-			"SELECT rating, COUNT( IFNULL( rating, 1 ) ) AS count
-			FROM {$this->tables['reading_log']} AS log 
-			WHERE date_finished >= %s 
-			AND date_finished <= %s 
-			AND date_finished IS NOT NULL 
-			GROUP BY rating
-			ORDER BY rating DESC",
-			$this->start_date,
-			$this->end_date
-		);
-
-		$this->log( $query, __METHOD__ );
-
-		$results     = $this->wpdb->get_results( $query );
-		$final_array = $temp_array = array();
-
-		foreach ( get_available_ratings() as $rating => $label ) {
-			$temp_array[ $rating ] = 0;
-		}
-
-		if ( is_array( $results ) ) {
-			foreach ( $results as $result ) {
-				$key                = ( null === $result->rating ) ? 'none' : (string) ( $result->rating * 1 );
-				$temp_array[ $key ] = absint( $result->count );
-			}
-		}
-
-		foreach ( $temp_array as $key => $value ) {
-			$rating        = new Rating( $key );
-			$final_array[] = array(
-				'rating'       => 'none' === $key ? 'none' : $rating->format( $this->args['rating_format'] ),
-				'number_books' => $value
-			);
-		}
-
-		return $final_array;
-
-	}
-
-	/**
-	 * Get pages breakdown
-	 *
-	 * Returns a table containing page ranges, along with how many books fell into that range.
-	 * Example:
-	 *
-	 * +------------+-----------------+
-	 * | page_range | number of books |
-	 * +------------+-----------------+
-	 * | 0-199      |               2 |
-	 * | 200-399    |               6 |
-	 * | 400-599    |               1 |
-	 * +------------+-----------------+
-	 *
-	 * @param int $number_range Number of pages in each range.
-	 *
-	 * @return array
-	 */
-	public function get_pages_breakdown( $number_range = 200 ) {
-
-		$query = $this->wpdb->prepare(
-			"SELECT CONCAT( %d * FLOOR( pages/%d ), '-', %d * FLOOR( pages/%d ) + %d ) AS page_range, COUNT(*) AS number_books
-			FROM {$this->tables['reading_log']} AS log 
-			INNER JOIN {$this->tables['books']} AS book ON ( book.id = log.book_id )
-			WHERE date_finished >= %s
-			AND date_finished <= %s 
-			AND date_finished IS NOT NULL 
-			AND book.pages IS NOT NULL 
-			GROUP BY 1
-			ORDER BY pages",
-			absint( $number_range ),
-			absint( $number_range ),
-			absint( $number_range ),
-			absint( $number_range ),
-			absint( $number_range - 1 ),
-			$this->start_date,
-			$this->end_date
-		);
-
-		$this->log( $query, __NAMESPACE__ );
-
-		$breakdown = $this->wpdb->get_results( $query, ARRAY_A );
-
-		if ( ! is_array( $breakdown ) ) {
-			$breakdown = array();
-		}
-
-		return $breakdown;
-
-	}
-
-	/**
-	 * Get taxonomy breakdown
-	 *
-	 * For each term: number of books read, average rating, and term name.
-	 *
-	 * @param string $taxonomy Taxonomy slug
-	 *
-	 * @return array|object|null
-	 */
-	public function get_taxonomy_breakdown( $taxonomy ) {
-
-		$query = $this->wpdb->prepare(
-			"SELECT COUNT( log.id ) AS number_books_read, ROUND( AVG( log.rating ), 2 ) AS average_rating, COUNT( review.id ) AS number_reviews, term.name AS term_name
-			FROM {$this->tables['reading_log']} AS log 
-			LEFT JOIN {$this->tables['reviews']} AS review ON ( review.reading_log_id = log.id )
-			INNER JOIN {$this->tables['term_r']} AS tr ON ( tr.book_id = log.book_id )
-			INNER JOIN {$this->tables['book_terms']} AS term ON ( term.id = tr.term_id )
-			WHERE date_finished >= %s 
-			AND date_finished <= %s 
-			AND date_finished IS NOT NULL 
-			AND term.taxonomy = %s 
-			GROUP BY term.taxonomy, term.name 
-			ORDER BY term.name ASC",
-			$this->start_date,
-			$this->end_date,
-			$taxonomy
-		);
-
-		$this->log( $query, __NAMESPACE__ );
-
-		$results = $this->wpdb->get_results( $query );
-
-		// Format rating.
-		foreach ( $results as $key => $result ) {
-			$rating                          = new Rating( $result->average_rating );
-			$results[ $key ]->average_rating = $rating->format( $this->args['rating_format'] );
-		}
-
-		return $results;
-
-	}
-
-	/**
-	 * Get a list of reviews written
-	 *
-	 * Limited to 20 results.
-	 *
-	 * @return object[]|array
-	 */
-	public function get_reviews_written() {
-
-		$reviews = $this->query_reviews();
-
-		if ( ! is_array( $reviews ) ) {
-			return null;
-		}
-
-		// Limit results to 20.
-		if ( count( $reviews ) > 20 ) {
-			$reviews = array_slice( $reviews, 0, 20 );
-		}
-
-		foreach ( $reviews as $key => $review ) {
-			$rating                        = new Rating( $review->rating );
-			$reviews[ $key ]->rating       = $rating->format_html_stars();
-			$reviews[ $key ]->rating_class = $rating->format_html_class();
-		}
-
-		return $reviews;
-
-	}
-
-	/**
-	 * Get a list of books that have been read but not reviewed
-	 *
-	 * Limited to 20 results.
-	 *
-	 * @return object[]|array
-	 */
-	public function get_read_not_reviewed() {
-
-		$query = $this->wpdb->prepare(
-			"SELECT DISTINCT log.id, log.date_started, log.date_finished, log.rating, log.percentage_complete, book.id AS book_id, book.title AS book_title, GROUP_CONCAT(author.name SEPARATOR ', ') AS author_name
-			FROM {$this->tables['reading_log']} AS log 
-			INNER JOIN {$this->tables['books']} AS book ON ( log.book_id = book.id )
-			LEFT JOIN {$this->tables['author_r']} AS ar ON ( log.book_id = ar.book_id )
-			INNER JOIN {$this->tables['authors']} AS author ON ( ar.author_id = author.id )
-			LEFT JOIN {$this->tables['reviews']} AS review ON ( book.id = review.book_id )
-			WHERE date_finished >= %s 
-			AND date_finished <= %s 
-			AND date_finished IS NOT NULL 
-			AND review.book_id IS NULL
-			GROUP BY book.id 
-			ORDER BY log.date_finished DESC 
-			LIMIT 20",
-			$this->start_date,
-			$this->end_date
-		);
-
-		$this->log( $query, __METHOD__ );
-
-		$books = $this->wpdb->get_results( $query );
-
-		if ( ! is_array( $books ) ) {
-			return null;
-		}
-
-		foreach ( $books as $key => $book ) {
-			$rating                      = new Rating( $book->rating );
-			$books[ $key ]->rating       = $rating->format_html_stars();
-			$books[ $key ]->rating_class = $rating->format_html_class();
-		}
-
-		return $books;
-
-	}
-
-}
\ No newline at end of file
diff --git a/vendor/class-edd-sl-plugin-updater.php b/includes/class-edd-sl-plugin-updater.php
similarity index 100%
rename from vendor/class-edd-sl-plugin-updater.php
rename to includes/class-edd-sl-plugin-updater.php
diff --git a/includes/class-exception.php b/includes/class-exception.php
deleted file mode 100644
index 34eb7f67..00000000
--- a/includes/class-exception.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Exception
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Exception
- * @package Book_Database
- */
-class Exception extends \Exception {
-
-	protected $error_type = '';
-
-	/**
-	 * Exception constructor.
-	 *
-	 * @param string          $error_type Type of error. A non-translated version of the message.
-	 * @param string          $message    Error message.
-	 * @param int             $code_number Error code.
-	 * @param \Exception|null $previous
-	 */
-	public function __construct( $error_type, $message, $code_number = 0, \Exception $previous = null ) {
-
-		$this->error_type = $error_type;
-
-		parent::__construct( $message, $code_number, $previous );
-
-	}
-
-	/**
-	 * Get the error type
-	 *
-	 * @return string
-	 */
-	public function get_error_type() {
-		return $this->error_type;
-	}
-
-}
\ No newline at end of file
diff --git a/includes/class-html.php b/includes/class-html.php
deleted file mode 100644
index 4208d728..00000000
--- a/includes/class-html.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * HTML Helper Class
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class HTML
- * @package Book_Database
- */
-class HTML {
-
-	/**
-	 * Output a meta row
-	 *
-	 * @param array $args
-	 */
-	public function meta_row( $args = array() ) {
-
-		$args = wp_parse_args( $args, array(
-			'label' => '',
-			'field' => '',
-			'id'    => ''
-		) );
-		?>
-		<div class="bdb-meta-row">
-			<label for="<?php echo esc_attr( $args['id'] ) ?? ''; ?>"><?php echo esc_html( $args['label'] ); ?></label>
-			<div class="bdb-meta-value">
-				<?php echo $args['field']; ?>
-			</div>
-		</div>
-		<?php
-
-	}
-
-	/**
-	 * Render a taxonomy field according to its setting (checkboxes or text input)
-	 *
-	 * @param Book_Taxonomy|string $taxonomy Taxonomy object or slug.
-	 * @param array                $args     Display arguments.
-	 */
-	public function taxonomy_field( $taxonomy, $args = array() ) {
-
-		$args = wp_parse_args( $args, array(
-			'selected' => array(),
-			'number'   => 300,
-			'id'       => ''
-		) );
-
-		if ( ! $taxonomy instanceof Book_Taxonomy ) {
-			$taxonomy = get_book_taxonomy_by( 'slug', $taxonomy );
-		}
-
-		if ( ! $taxonomy instanceof Book_Taxonomy ) {
-			return;
-		}
-
-		if ( 'checkbox' === $taxonomy->get_format() ) {
-
-			// "Categories"
-
-			// Get all terms EXCEPT the ones already checked.
-			$all_terms = get_book_terms( array(
-				'number'       => 300,
-				'taxonomy'     => $taxonomy->get_slug(),
-				'name__not_in' => $args['selected'],
-				'fields'       => 'name',
-				'orderby'      => 'name',
-				'order'        => 'ASC'
-			) );
-
-			$final_terms = $args['selected'] + $all_terms;
-			?>
-			<div id="bdb-checkboxes-<?php echo esc_attr( sanitize_html_class( $taxonomy->get_slug() . '-' . $args['id'] ) ); ?>" class="bdb-taxonomy-checkboxes" data-taxonomy="<?php echo esc_attr( $taxonomy->get_slug() ); ?>" data-name="<?php echo esc_attr( 'book_terms[' . $taxonomy->get_slug() . '][]' ); ?>">
-				<div class="bdb-checkbox-wrap">
-					<?php
-					foreach ( $final_terms as $term_name ) {
-						?>
-						<label for="<?php echo esc_attr( sanitize_html_class( sanitize_key( sprintf( '%s-%s-%s', $taxonomy->get_slug(), $term_name, $args['id'] ) ) ) ); ?>">
-							<input type="checkbox" id="<?php echo esc_attr( sanitize_html_class( sanitize_key( sprintf( '%s-%s-%s', $taxonomy->get_slug(), $term_name, $args['id'] ) ) ) ); ?>" class="bdb-checkbox" name="book_terms[<?php echo esc_attr( $taxonomy->get_slug() ); ?>][]" value="<?php echo esc_attr( $term_name ); ?>" <?php checked( in_array( $term_name, $args['selected'] ) ); ?>>
-							<?php echo esc_html( $term_name ); ?>
-						</label>
-						<?php
-					}
-					?>
-				</div>
-				<div class="bdb-new-checkbox-term">
-					<label for="bdb-new-checkbox-term-<?php echo esc_attr( sanitize_html_class( $taxonomy->get_slug() ) ); ?>" class="screen-reader-text"><?php printf( esc_html__( 'Enter the name of a new %s', 'book-database' ), esc_html( lcfirst( $taxonomy->get_name() ) ) ); ?></label>
-					<input type="text" id="bdb-new-checkbox-term-<?php echo esc_attr( sanitize_html_class( $taxonomy->get_slug() ) ); ?>" class="regular-text bdb-new-checkbox-term-value">
-					<input type="button" class="button" value="<?php esc_attr_e( 'Add', 'book-database' ); ?>">
-				</div>
-			</div>
-			<?php
-
-		} else {
-
-			// "Tags"
-
-			?>
-			<div id="bdb-tags-<?php echo esc_attr( sanitize_html_class( $taxonomy->get_slug() ) ); ?>" class="bdb-tags-wrap" data-taxonomy="<?php echo esc_attr( $taxonomy->get_slug() ); ?>">
-				<div class="jaxtag">
-					<div class="nojs-tags hide-if-js">
-						<label for="bdb-input-tag-<?php echo esc_attr( sanitize_html_class( $taxonomy->get_slug() ) ); ?>"><?php printf( __( 'Enter the name of the %s', 'book-database' ), esc_html( $taxonomy->get_name() ) ); ?></label>
-						<textarea name="book_terms[<?php echo esc_attr( $taxonomy->get_slug() ); ?>]" rows="3" cols="20" id="bdb-input-tag-<?php echo esc_attr( sanitize_html_class( $taxonomy->get_slug() ) ); ?>" data-taxonomy="<?php echo esc_attr( $taxonomy->get_slug() ); ?>"><?php echo esc_textarea( implode( ', ', $args['selected'] ) ); ?></textarea>
-					</div>
-					<div class="bdb-ajaxtag hide-if-no-js">
-						<p>
-							<label for="bdb-new-<?php echo esc_attr( sanitize_html_class( $taxonomy->get_slug() ) ); ?>-term" class="screen-reader-text"><?php printf( __( 'Enter the name of the %s', 'book-database' ), esc_html( $taxonomy->get_name() ) ); ?></label>
-							<input type="text" id="bdb-new-<?php echo esc_attr( sanitize_html_class( $taxonomy->get_slug() ) ); ?>-term" class="form-input-tip regular-text bdb-new-tag" size="16" autocomplete="off" value="">
-							<input type="button" class="button" value="<?php esc_attr_e( 'Add', 'book-database' ); ?>" tabindex="3">
-						</p>
-					</div>
-				</div>
-				<div class="bdb-tags-checklist"></div>
-			</div>
-			<?php
-
-		}
-
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/authors/class-authors-query.php b/includes/database/authors/class-authors-query.php
deleted file mode 100644
index 1ab5b227..00000000
--- a/includes/database/authors/class-authors-query.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Authors Query
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Authors_Query
- * @package Book_Database
- */
-class Authors_Query extends BerlinDB\Database\Query {
-
-	/**
-	 * Name of the table to query
-	 *
-	 * @var string
-	 */
-	protected $table_name = 'authors';
-
-	/**
-	 * String used to alias the database table in MySQL statements
-	 *
-	 * @var string
-	 */
-	protected $table_alias = 'author';
-
-	/**
-	 * Name of class used to set up the database schema
-	 *
-	 * @var string
-	 */
-	protected $table_schema = '\\Book_Database\\Authors_Schema';
-
-	/**
-	 * Name for a single item
-	 *
-	 * @var string
-	 */
-	protected $item_name = 'author';
-
-	/**
-	 * Plural version for a group of items
-	 *
-	 * @var string
-	 */
-	protected $item_name_plural = 'authors';
-
-	/**
-	 * Class name to turn IDs into these objects
-	 *
-	 * @var string
-	 */
-	protected $item_shape = '\\Book_Database\\Author';
-
-	/**
-	 * Group to cache queries and queried items to
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'authors';
-
-	/**
-	 * Query constructor.
-	 *
-	 * @param array $args
-	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( $args );
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/authors/class-authors-schema.php b/includes/database/authors/class-authors-schema.php
deleted file mode 100644
index 51124673..00000000
--- a/includes/database/authors/class-authors-schema.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Authors Schema
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Authors_Schema
- *
- * @package Book_Database
- */
-class Authors_Schema extends BerlinDB\Database\Schema {
-
-	/**
-	 * Array of database columns
-	 *
-	 * @var array
-	 */
-	public $columns = array(
-
-		// id
-		array(
-			'name'     => 'id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'extra'    => 'auto_increment',
-			'primary'  => true,
-			'sortable' => true
-		),
-
-		// name
-		array(
-			'name'       => 'name',
-			'type'       => 'varchar',
-			'length'     => '200',
-			'sortable'   => true,
-			'searchable' => true,
-			'validate'   => 'sanitize_text_field'
-		),
-
-		// slug
-		array(
-			'name'     => 'slug',
-			'type'     => 'varchar',
-			'length'   => '200',
-			'sortable' => true,
-			'validate' => 'sanitize_key'
-		),
-
-		// description
-		array(
-			'name'     => 'description',
-			'type'     => 'longtext',
-			'validate' => 'wp_kses_post'
-		),
-
-		// image_id
-		array(
-			'name'       => 'image_id',
-			'type'       => 'bigint',
-			'length'     => '20',
-			'unsigned'   => true,
-			'sortable'   => true,
-			'allow_null' => true,
-			'default'    => null,
-			'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
-		),
-
-		// links
-		array(
-			'name' => 'links',
-			'type' => 'longtext',
-		),
-
-		// book_count
-		array(
-			'name'     => 'book_count',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'sortable' => true,
-			'default'  => 0
-		),
-
-		// date_created
-		array(
-			'name'       => 'date_created',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'created'    => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-		// date_modified
-		array(
-			'name'       => 'date_modified',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'modified'   => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-	);
-
-}
\ No newline at end of file
diff --git a/includes/database/authors/class-authors-table.php b/includes/database/authors/class-authors-table.php
deleted file mode 100644
index 68886612..00000000
--- a/includes/database/authors/class-authors-table.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Authors Table
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Authors_Table
- *
- * @package Book_Database
- */
-class Authors_Table extends BerlinDB\Database\Table {
-
-	/**
-	 * @var string Table name
-	 */
-	protected $name = 'authors';
-
-	/**
-	 * @var int Database version in format {YYYY}{MM}{DD}{1}
-	 */
-	protected $version = 201910131;
-
-	/**
-	 * @var array Upgrades to perform
-	 */
-	protected $upgrades = array();
-
-	/**
-	 * Book_Taxonomies_Table constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-	}
-
-	/**
-	 * Set up the database schema
-	 */
-	protected function set_schema() {
-		$this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-			name varchar(200) NOT NULL DEFAULT '',
-			slug varchar(200) NOT NULL DEFAULT '',
-			description longtext NOT NULL DEFAULT '',
-			image_id bigint(20) UNSIGNED DEFAULT NULL,
-			links longtext NOT NULL DEFAULT '',
-			book_count bigint(20) UNSIGNED NOT NULL DEFAULT 0,
-			date_created datetime NOT NULL,
-			date_modified datetime NOT NULL,
-			INDEX name (name),
-			INDEX slug (slug)";
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/book-author-relationships/class-book-author-relationships-query.php b/includes/database/book-author-relationships/class-book-author-relationships-query.php
deleted file mode 100644
index 79528239..00000000
--- a/includes/database/book-author-relationships/class-book-author-relationships-query.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Book Author Relationships Query
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Author_Relationships_Query
- * @package Book_Database
- */
-class Book_Author_Relationships_Query extends BerlinDB\Database\Query {
-
-	/**
-	 * Name of the table to query
-	 *
-	 * @var string
-	 */
-	protected $table_name = 'book_author_relationships';
-
-	/**
-	 * String used to alias the database table in MySQL statements
-	 *
-	 * @var string
-	 */
-	protected $table_alias = 'ar';
-
-	/**
-	 * Name of class used to set up the database schema
-	 *
-	 * @var string
-	 */
-	protected $table_schema = '\\Book_Database\\Book_Author_Relationships_Schema';
-
-	/**
-	 * Name for a single item
-	 *
-	 * @var string
-	 */
-	protected $item_name = 'book_author_relationship';
-
-	/**
-	 * Plural version for a group of items
-	 *
-	 * @var string
-	 */
-	protected $item_name_plural = 'book_author_relationships';
-
-	/**
-	 * Class name to turn IDs into these objects
-	 *
-	 * @var string
-	 */
-	protected $item_shape = '\\Book_Database\\Book_Author_Relationship';
-
-	/**
-	 * Group to cache queries and queried items to
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'book_author_relationships';
-
-	/**
-	 * Query constructor.
-	 *
-	 * @param array $args
-	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( $args );
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/book-author-relationships/class-book-author-relationships-schema.php b/includes/database/book-author-relationships/class-book-author-relationships-schema.php
deleted file mode 100644
index f873a1d6..00000000
--- a/includes/database/book-author-relationships/class-book-author-relationships-schema.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Book Author Relationships Schema
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Author_Relationships_Schema
- *
- * @package Book_Database
- */
-class Book_Author_Relationships_Schema extends BerlinDB\Database\Schema {
-
-	/**
-	 * Array of database columns
-	 *
-	 * @var array
-	 */
-	public $columns = array(
-
-		// id
-		array(
-			'name'     => 'id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'extra'    => 'auto_increment',
-			'primary'  => true,
-			'sortable' => true
-		),
-
-		// author_id
-		array(
-			'name'     => 'author_id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'sortable' => true
-		),
-
-		// book_id
-		array(
-			'name'     => 'book_id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'sortable' => true
-		),
-
-		// date_created
-		array(
-			'name'       => 'date_created',
-			'type'       => 'datetime',
-			'default'    => '',
-			'created'    => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-		// date_modified
-		array(
-			'name'       => 'date_modified',
-			'type'       => 'datetime',
-			'default'    => '',
-			'modified'   => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-	);
-
-}
\ No newline at end of file
diff --git a/includes/database/book-author-relationships/class-book-author-relationships-table.php b/includes/database/book-author-relationships/class-book-author-relationships-table.php
deleted file mode 100644
index 869ba31f..00000000
--- a/includes/database/book-author-relationships/class-book-author-relationships-table.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Book Author Relationships Table
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Author_Relationships_Table
- *
- * @package Book_Database
- */
-class Book_Author_Relationships_Table extends BerlinDB\Database\Table {
-
-	/**
-	 * @var string Table name
-	 */
-	protected $name = 'book_author_relationships';
-
-	/**
-	 * @var int Database version in format {YYYY}{MM}{DD}{1}
-	 */
-	protected $version = 201910131;
-
-	/**
-	 * @var array Upgrades to perform
-	 */
-	protected $upgrades = array();
-
-	/**
-	 * Book_Term_Relationships_Table constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-	}
-
-	/**
-	 * Set up the database schema
-	 */
-	protected function set_schema() {
-		$this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-			author_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
-			book_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
-			date_created datetime NOT NULL,
-			date_modified datetime NOT NULL,
-			INDEX author_id (author_id),
-			INDEX book_id (book_id)";
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/book-links/class-book-links-query.php b/includes/database/book-links/class-book-links-query.php
deleted file mode 100644
index 9eb91bf7..00000000
--- a/includes/database/book-links/class-book-links-query.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Book Links Query
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Links_Query
- * @package Book_Database
- */
-class Book_Links_Query extends BerlinDB\Database\Query {
-
-	/**
-	 * Name of the table to query
-	 *
-	 * @var string
-	 */
-	protected $table_name = 'book_links';
-
-	/**
-	 * String used to alias the database table in MySQL statements
-	 *
-	 * @var string
-	 */
-	protected $table_alias = 'link';
-
-	/**
-	 * Name of class used to set up the database schema
-	 *
-	 * @var string
-	 */
-	protected $table_schema = '\\Book_Database\\Book_Links_Schema';
-
-	/**
-	 * Name for a single item
-	 *
-	 * @var string
-	 */
-	protected $item_name = 'book_link';
-
-	/**
-	 * Plural version for a group of items
-	 *
-	 * @var string
-	 */
-	protected $item_name_plural = 'book_links';
-
-	/**
-	 * Class name to turn IDs into these objects
-	 *
-	 * @var string
-	 */
-	protected $item_shape = '\\Book_Database\\Book_Link';
-
-	/**
-	 * Group to cache queries and queried items to
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'book_links';
-
-	/**
-	 * Query constructor.
-	 *
-	 * @param array $args
-	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( $args );
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/book-links/class-book-links-schema.php b/includes/database/book-links/class-book-links-schema.php
deleted file mode 100644
index 5a2684be..00000000
--- a/includes/database/book-links/class-book-links-schema.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Book Links Schema
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Links_Schema
- *
- * @package Book_Database
- */
-class Book_Links_Schema extends BerlinDB\Database\Schema {
-
-	/**
-	 * Array of database columns
-	 *
-	 * @var array
-	 */
-	public $columns = array(
-
-		// id
-		array(
-			'name'     => 'id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'extra'    => 'auto_increment',
-			'primary'  => true,
-			'sortable' => true
-		),
-
-		// book_id
-		array(
-			'name'     => 'book_id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'sortable' => true,
-			'validate' => 'absint'
-		),
-
-		// retailer_id
-		array(
-			'name'     => 'retailer_id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'sortable' => true,
-			'validate' => 'absint'
-		),
-
-		// url
-		array(
-			'name'       => 'url',
-			'type'       => 'text',
-			'searchable' => true,
-			'validate'   => 'esc_url_raw'
-		),
-
-		// date_created
-		array(
-			'name'       => 'date_created',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'created'    => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-		// date_modified
-		array(
-			'name'       => 'date_modified',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'modified'   => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-	);
-
-}
\ No newline at end of file
diff --git a/includes/database/book-links/class-book-links-table.php b/includes/database/book-links/class-book-links-table.php
deleted file mode 100644
index c472f434..00000000
--- a/includes/database/book-links/class-book-links-table.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Book Links Table
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Links_Table
- *
- * @package Book_Database
- */
-class Book_Links_Table extends BerlinDB\Database\Table {
-
-	/**
-	 * @var string Table name
-	 */
-	protected $name = 'book_links';
-
-	/**
-	 * @var int Database version in format {YYYY}{MM}{DD}{1}
-	 */
-	protected $version = 201910311;
-
-	/**
-	 * @var array Upgrades to perform
-	 */
-	protected $upgrades = array();
-
-	/**
-	 * Book_Taxonomies_Table constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-	}
-
-	/**
-	 * Set up the database schema
-	 */
-	protected function set_schema() {
-		$this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-			book_id bigint(20) UNSIGNED NOT NULL,
-			retailer_id bigint(20) UNSIGNED NOT NULL,
-			url text NOT NULL DEFAULT '',
-			date_created datetime NOT NULL,
-			date_modified datetime NOT NULL,
-			INDEX book_id (book_id)";
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/book-taxonomies/class-book-taxonomies-query.php b/includes/database/book-taxonomies/class-book-taxonomies-query.php
deleted file mode 100644
index 3943b4a5..00000000
--- a/includes/database/book-taxonomies/class-book-taxonomies-query.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Book Taxonomies Query
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Taxonomies_Query
- * @package Book_Database
- */
-class Book_Taxonomies_Query extends BerlinDB\Database\Query {
-
-	/**
-	 * Name of the table to query
-	 *
-	 * @var string
-	 */
-	protected $table_name = 'book_taxonomies';
-
-	/**
-	 * String used to alias the database table in MySQL statements
-	 *
-	 * @var string
-	 */
-	protected $table_alias = 'btax';
-
-	/**
-	 * Name of class used to set up the database schema
-	 *
-	 * @var string
-	 */
-	protected $table_schema = '\\Book_Database\\Book_Taxonomies_Schema';
-
-	/**
-	 * Name for a single item
-	 *
-	 * @var string
-	 */
-	protected $item_name = 'book_taxonomy';
-
-	/**
-	 * Plural version for a group of items
-	 *
-	 * @var string
-	 */
-	protected $item_name_plural = 'book_taxonomies';
-
-	/**
-	 * Class name to turn IDs into these objects
-	 *
-	 * @var string
-	 */
-	protected $item_shape = '\\Book_Database\\Book_Taxonomy';
-
-	/**
-	 * Group to cache queries and queried items to
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'book_taxonomies';
-
-	/**
-	 * Query constructor.
-	 *
-	 * @param array $args
-	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( $args );
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/book-taxonomies/class-book-taxonomies-schema.php b/includes/database/book-taxonomies/class-book-taxonomies-schema.php
deleted file mode 100644
index 5552ec7e..00000000
--- a/includes/database/book-taxonomies/class-book-taxonomies-schema.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Book Taxonomies Schema
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Taxonomies_Schema
- *
- * @package Book_Database
- */
-class Book_Taxonomies_Schema extends BerlinDB\Database\Schema {
-
-	/**
-	 * Array of database columns
-	 *
-	 * @var array
-	 */
-	public $columns = array(
-
-		// id
-		array(
-			'name'     => 'id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'extra'    => 'auto_increment',
-			'primary'  => true,
-			'sortable' => true
-		),
-
-		// name
-		array(
-			'name'       => 'name',
-			'type'       => 'varchar',
-			'length'     => '32',
-			'sortable'   => true,
-			'searchable' => true,
-			'validate'   => 'sanitize_text_field'
-		),
-
-		// slug
-		array(
-			'name'     => 'slug',
-			'type'     => 'varchar',
-			'length'   => '32',
-			'sortable' => true,
-			'validate' => 'sanitize_key'
-		),
-
-		// format
-		array(
-			'name'     => 'format',
-			'type'     => 'varchar',
-			'length'   => '32',
-			'sortable' => true,
-			'default'  => 'text',
-			'validate' => 'sanitize_text_field'
-		),
-
-		// date_created
-		array(
-			'name'       => 'date_created',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'created'    => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-		// date_modified
-		array(
-			'name'       => 'date_modified',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'modified'   => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-	);
-
-}
\ No newline at end of file
diff --git a/includes/database/book-taxonomies/class-book-taxonomies-table.php b/includes/database/book-taxonomies/class-book-taxonomies-table.php
deleted file mode 100644
index 7f9312cc..00000000
--- a/includes/database/book-taxonomies/class-book-taxonomies-table.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Book Taxonomies Table
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Taxonomies_Table
- *
- * @package Book_Database
- */
-class Book_Taxonomies_Table extends BerlinDB\Database\Table {
-
-	/**
-	 * @var string Table name
-	 */
-	protected $name = 'book_taxonomies';
-
-	/**
-	 * @var int Database version in format {YYYY}{MM}{DD}{1}
-	 */
-	protected $version = 201910111;
-
-	/**
-	 * @var array Upgrades to perform
-	 */
-	protected $upgrades = array();
-
-	/**
-	 * Book_Taxonomies_Table constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-	}
-
-	/**
-	 * Set up the database schema
-	 */
-	protected function set_schema() {
-		$this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-			name varchar(32) NOT NULL DEFAULT '',
-			slug varchar(32) NOT NULL DEFAULT '',
-			format varchar(32) NOT NULL DEFAULT 'text',
-			date_created datetime NOT NULL,
-			date_modified datetime NOT NULL,
-			INDEX slug( slug )";
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/book-term-relationships/class-book-term-relationships-query.php b/includes/database/book-term-relationships/class-book-term-relationships-query.php
deleted file mode 100644
index c5d96b61..00000000
--- a/includes/database/book-term-relationships/class-book-term-relationships-query.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Book Term Relationships Query
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Term_Relationships_Query
- * @package Book_Database
- */
-class Book_Term_Relationships_Query extends BerlinDB\Database\Query {
-
-	/**
-	 * Name of the table to query
-	 *
-	 * @var string
-	 */
-	protected $table_name = 'book_term_relationships';
-
-	/**
-	 * String used to alias the database table in MySQL statements
-	 *
-	 * @var string
-	 */
-	protected $table_alias = 'btr';
-
-	/**
-	 * Name of class used to set up the database schema
-	 *
-	 * @var string
-	 */
-	protected $table_schema = '\\Book_Database\\Book_Term_Relationships_Schema';
-
-	/**
-	 * Name for a single item
-	 *
-	 * @var string
-	 */
-	protected $item_name = 'book_term_relationship';
-
-	/**
-	 * Plural version for a group of items
-	 *
-	 * @var string
-	 */
-	protected $item_name_plural = 'book_term_relationships';
-
-	/**
-	 * Class name to turn IDs into these objects
-	 *
-	 * @var string
-	 */
-	protected $item_shape = '\\Book_Database\\Book_Term_Relationship';
-
-	/**
-	 * Group to cache queries and queried items to
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'book_term_relationships';
-
-	/**
-	 * Query constructor.
-	 *
-	 * @param array $args
-	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( $args );
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/book-term-relationships/class-book-term-relationships-schema.php b/includes/database/book-term-relationships/class-book-term-relationships-schema.php
deleted file mode 100644
index 2825f2cb..00000000
--- a/includes/database/book-term-relationships/class-book-term-relationships-schema.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Book Term Relationships Schema
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Term_Relationships_Schema
- *
- * @package Book_Database
- */
-class Book_Term_Relationships_Schema extends BerlinDB\Database\Schema {
-
-	/**
-	 * Array of database columns
-	 *
-	 * @var array
-	 */
-	public $columns = array(
-
-		// id
-		array(
-			'name'     => 'id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'extra'    => 'auto_increment',
-			'primary'  => true,
-			'sortable' => true
-		),
-
-		// term_id
-		array(
-			'name'     => 'term_id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'sortable' => true
-		),
-
-		// book_id
-		array(
-			'name'     => 'book_id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'sortable' => true
-		),
-
-		// date_created
-		array(
-			'name'       => 'date_created',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'created'    => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-		// date_modified
-		array(
-			'name'       => 'date_modified',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'modified'   => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-	);
-
-}
\ No newline at end of file
diff --git a/includes/database/book-term-relationships/class-book-term-relationships-table.php b/includes/database/book-term-relationships/class-book-term-relationships-table.php
deleted file mode 100644
index 25a0a5b7..00000000
--- a/includes/database/book-term-relationships/class-book-term-relationships-table.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * Book Term Relationships Table
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Term_Relationships_Table
- *
- * @package Book_Database
- */
-class Book_Term_Relationships_Table extends BerlinDB\Database\Table {
-
-	/**
-	 * @var string Table name
-	 */
-	protected $name = 'book_term_relationships';
-
-	/**
-	 * @var int Database version in format {YYYY}{MM}{DD}{1}
-	 */
-	protected $version = 201910124;
-
-	/**
-	 * @var array Upgrades to perform
-	 */
-	protected $upgrades = array(
-		'201910122' => 201910122,
-		'201910123' => 201910123,
-		'201910124' => 201910124
-	);
-
-	/**
-	 * Book_Term_Relationships_Table constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-	}
-
-	/**
-	 * Set up the database schema
-	 */
-	protected function set_schema() {
-		$this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-			term_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
-			book_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
-			date_created datetime NOT NULL,
-			date_modified datetime NOT NULL,
-			INDEX book_id (book_id),
-			INDEX term_id (term_id)";
-	}
-
-	/**
-	 * If the old `wp_bdb_book_term_relationships_db_version` option exists, copy that value to our new version key.
-	 * This will ensure new upgrades are processed on old installs.
-	 */
-	public function maybe_upgrade() {
-
-		$old_key     = $this->get_db()->prefix . 'bdb_book_term_relationships_db_version';
-		$old_version = get_option( $old_key );
-
-		if ( false !== $old_version ) {
-			update_option( $this->db_version_key, get_option( $old_key ) );
-
-			delete_option( $old_key );
-		}
-
-		return parent::maybe_upgrade();
-
-	}
-
-	/**
-	 * Upgrade to version 201910122
-	 *      - Rename `ID` to `id` & add `unsigned`
-	 *
-	 * @return bool
-	 */
-	protected function __201910122() {
-
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} CHANGE `ID` `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT" );
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910123
-	 *      - Add `unsigned` to `term_id` and `book_id`
-	 *
-	 * @return bool
-	 */
-	protected function __201910123() {
-
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} MODIFY term_id bigint(20) UNSIGNED NOT NULL DEFAULT 0" );
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} MODIFY book_id bigint(20) UNSIGNED NOT NULL DEFAULT 0" );
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910124
-	 *      - Add `date_created` column
-	 *      - Add `date_modified` column
-	 *
-	 * @return bool
-	 */
-	protected function __201910124() {
-
-		$result = $this->column_exists( 'date_created' );
-
-		if ( ! $result ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD COLUMN date_created datetime NOT NULL DEFAULT '0000-00-00 00:00:00'" );
-		}
-
-		$result = $this->column_exists( 'date_modified' );
-
-		if ( ! $result ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD COLUMN date_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00'" );
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/book-terms/class-book-terms-query.php b/includes/database/book-terms/class-book-terms-query.php
deleted file mode 100644
index e9147084..00000000
--- a/includes/database/book-terms/class-book-terms-query.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Book Terms Query
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Terms_Query
- * @package Book_Database
- */
-class Book_Terms_Query extends BerlinDB\Database\Query {
-
-	/**
-	 * Name of the table to query
-	 *
-	 * @var string
-	 */
-	protected $table_name = 'book_terms';
-
-	/**
-	 * String used to alias the database table in MySQL statements
-	 *
-	 * @var string
-	 */
-	protected $table_alias = 'bt';
-
-	/**
-	 * Name of class used to set up the database schema
-	 *
-	 * @var string
-	 */
-	protected $table_schema = '\\Book_Database\\Book_Terms_Schema';
-
-	/**
-	 * Name for a single item
-	 *
-	 * @var string
-	 */
-	protected $item_name = 'book_term';
-
-	/**
-	 * Plural version for a group of items
-	 *
-	 * @var string
-	 */
-	protected $item_name_plural = 'book_terms';
-
-	/**
-	 * Class name to turn IDs into these objects
-	 *
-	 * @var string
-	 */
-	protected $item_shape = '\\Book_Database\\Book_Term';
-
-	/**
-	 * Group to cache queries and queried items to
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'book_terms';
-
-	/**
-	 * Query constructor.
-	 *
-	 * @param array $args
-	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( $args );
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/book-terms/class-book-terms-schema.php b/includes/database/book-terms/class-book-terms-schema.php
deleted file mode 100644
index 40cef356..00000000
--- a/includes/database/book-terms/class-book-terms-schema.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * Book Terms Schema
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Terms_Schema
- *
- * @package Book_Database
- */
-class Book_Terms_Schema extends BerlinDB\Database\Schema {
-
-	/**
-	 * Array of database columns
-	 *
-	 * @var array
-	 */
-	public $columns = array(
-
-		// id
-		array(
-			'name'     => 'id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'extra'    => 'auto_increment',
-			'primary'  => true,
-			'sortable' => true
-		),
-
-		// taxonomy
-		array(
-			'name'     => 'taxonomy',
-			'type'     => 'varchar',
-			'length'   => '32',
-			'sortable' => true,
-			'validate' => 'sanitize_text_field'
-		),
-
-		// name
-		array(
-			'name'       => 'name',
-			'type'       => 'varchar',
-			'length'     => '200',
-			'sortable'   => true,
-			'searchable' => true,
-			'validate'   => 'sanitize_text_field'
-		),
-
-		// slug
-		array(
-			'name'       => 'slug',
-			'type'       => 'varchar',
-			'length'     => '200',
-			'sortable'   => true,
-			'searchable' => true,
-			'validate'   => 'sanitize_key'
-		),
-
-		// description
-		array(
-			'name'     => 'description',
-			'type'     => 'longtext',
-			'validate' => 'wp_kses_post'
-		),
-
-		// image_id
-		array(
-			'name'       => 'image_id',
-			'type'       => 'bigint',
-			'length'     => '20',
-			'unsigned'   => true,
-			'sortable'   => true,
-			'allow_null' => true,
-			'default'    => null,
-			'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
-		),
-
-		// links
-		array(
-			'name'       => 'links',
-			'type'       => 'longtext',
-		),
-
-		// book_count
-		array(
-			'name'     => 'book_count',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'sortable' => true
-		),
-
-		// date_created
-		array(
-			'name'       => 'date_created',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'created'    => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-		// date_modified
-		array(
-			'name'       => 'date_modified',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'modified'   => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-	);
-
-}
\ No newline at end of file
diff --git a/includes/database/book-terms/class-book-terms-table.php b/includes/database/book-terms/class-book-terms-table.php
deleted file mode 100644
index adf626e1..00000000
--- a/includes/database/book-terms/class-book-terms-table.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/**
- * Book Terms Table
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Terms_Table
- *
- * @package Book_Database
- */
-class Book_Terms_Table extends BerlinDB\Database\Table {
-
-	/**
-	 * @var string Table name
-	 */
-	protected $name = 'book_terms';
-
-	/**
-	 * @var int Database version in format {YYYY}{MM}{DD}{1}
-	 */
-	protected $version = 201910181;
-
-	/**
-	 * @var array Upgrades to perform
-	 */
-	protected $upgrades = array(
-		'201910122' => 201910122,
-		'201910123' => 201910123,
-		'201910125' => 201910125,
-		'201910126' => 201910126,
-		'201910181' => 201910181
-	);
-
-	/**
-	 * Book_Terms_Table constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-	}
-
-	/**
-	 * Set up the database schema
-	 */
-	protected function set_schema() {
-		$this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-			taxonomy varchar(32) NOT NULL DEFAULT '',
-			name varchar(200) NOT NULL DEFAULT '',
-			slug varchar(200) NOT NULL DEFAULT '',
-			description longtext NOT NULL DEFAULT '',
-			image_id bigint(20) UNSIGNED DEFAULT NULL,
-			links longtext NOT NULL DEFAULT '',
-			book_count bigint(20) UNSIGNED NOT NULL DEFAULT 0,
-			date_created datetime NOT NULL,
-			date_modified datetime NOT NULL,
-			INDEX id_taxonomy_name (id, taxonomy, name),
-			INDEX id_taxonomy_slug (id, taxonomy, slug),
-			INDEX taxonomy (taxonomy),
-			INDEX name (name)";
-	}
-
-	/**
-	 * If the old `wp_bdb_book_terms_db_version` option exists, copy that value to our new version key.
-	 * This will ensure new upgrades are processed on old installs.
-	 */
-	public function maybe_upgrade() {
-
-		$old_key     = $this->get_db()->prefix . 'bdb_book_terms_db_version';
-		$old_version = get_option( $old_key );
-
-		if ( false !== $old_version ) {
-			update_option( $this->db_version_key, get_option( $old_key ) );
-
-			delete_option( $old_key );
-		}
-
-		return parent::maybe_upgrade();
-
-	}
-
-	/**
-	 * Upgrade to version 201910122
-	 *      - Rename `term_id` to `id` & add `unsigned`
-	 *
-	 * @return bool
-	 */
-	protected function __201910122() {
-
-		$result = true;
-
-		// Drop keys involving `term_id` or `type`.
-		if ( $this->get_db()->query( "SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'id_type_name'" ) ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} DROP INDEX id_type_name" );
-		}
-		if ( $this->get_db()->query( "SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'id_type_slug'" ) ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} DROP INDEX id_type_slug" );
-		}
-		if ( $this->get_db()->query( "SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'type'" ) ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} DROP INDEX type" );
-		}
-
-		if ( $result && $this->column_exists( 'term_id' ) ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} CHANGE `term_id` `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT" );
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910123
-	 *      - Change `image` to `image_id` & add `unsigned`
-	 *
-	 * @return bool
-	 */
-	protected function __201910123() {
-
-		if ( $this->column_exists( 'image' ) ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} CHANGE `image` `image_id` bigint(20) UNSIGNED NOT NULL DEFAULT 0" );
-		} else {
-			$result = true;
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910125
-	 *      - Add `date_created` column
-	 *      - Add `date_modified` column
-	 *
-	 * @return bool
-	 */
-	protected function __201910125() {
-
-		$result = $this->column_exists( 'date_created' );
-
-		if ( ! $result ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD COLUMN date_created datetime NOT NULL DEFAULT '0000-00-00 00:00:00'" );
-		}
-
-		$result = $this->column_exists( 'date_modified' );
-
-		if ( ! $result ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD COLUMN date_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00'" );
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910126
-	 *      - Change `type` to `taxonomy`
-	 *      - Add new indexes
-	 *
-	 * @return bool
-	 */
-	protected function __201910126() {
-
-		if ( $this->column_exists( 'type' ) ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} CHANGE `type` `taxonomy` varchar(32) NOT NULL DEFAULT ''" );
-		} else {
-			$result = true;
-		}
-
-		// Add new indexes.
-		if ( $result ) {
-			if ( ! $this->get_db()->query( "SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'id_taxonomy_name'" ) ) {
-				$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD UNIQUE KEY id_taxonomy_name (id, taxonomy, name)" );
-			}
-			if ( ! $this->get_db()->query( "SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'id_taxonomy_slug'" ) ) {
-				$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD UNIQUE KEY id_taxonomy_slug (id, taxonomy, slug)" );
-			}
-			if ( ! $this->get_db()->query( "SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'taxonomy'" ) ) {
-				$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD KEY taxonomy (taxonomy)" );
-			}
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910181
-	 *      - Change `count` to `book_count`
-	 *
-	 * @return bool
-	 */
-	protected function __201910181() {
-
-		if ( $this->column_exists( 'count' ) && ! $this->column_exists( 'book_count' ) ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} CHANGE `count` `book_count` bigint(20) UNSIGNED NOT NULL DEFAULT 0" );
-		} else {
-			$result = true;
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-}
diff --git a/includes/database/books/class-book-meta-table.php b/includes/database/books/class-book-meta-table.php
deleted file mode 100644
index 18118375..00000000
--- a/includes/database/books/class-book-meta-table.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Book Meta Table
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Book_Meta_Table
- *
- * @package Book_Database
- */
-class Book_Meta_Table extends BerlinDB\Database\Table {
-
-	/**
-	 * @var string Table name
-	 */
-	protected $name = 'bookmeta';
-
-	/**
-	 * @var int Database version in format {YYYY}{MM}{DD}{1}
-	 */
-	protected $version = 201910271;
-
-	/**
-	 * @var array Upgrades to perform
-	 */
-	protected $upgrades = array();
-
-	/**
-	 * Reviews_Table constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-	}
-
-	/**
-	 * Set up the database schema
-	 */
-	protected function set_schema() {
-		$max_index_length = 191;
-		$this->schema = "meta_id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-			bdb_book_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
-			meta_key varchar(255) DEFAULT NULL,
-			meta_value longtext DEFAULT NULL,
-			INDEX bdb_book_id (bdb_book_id),
-			INDEX meta_key (meta_key({$max_index_length}))";
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/books/class-books-query.php b/includes/database/books/class-books-query.php
deleted file mode 100644
index dc1654ac..00000000
--- a/includes/database/books/class-books-query.php
+++ /dev/null
@@ -1,302 +0,0 @@
-<?php
-/**
- * Books Query
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-use Book_Database\BerlinDB\Database\Queries\Tax;
-use Book_Database\BerlinDB\Database\Query;
-
-/**
- * Class Books_Query
- *
- * @package Book_Database
- */
-class Books_Query extends BerlinDB\Database\Query {
-
-	/**
-	 * Name of the table to query
-	 *
-	 * @var string
-	 */
-	protected $table_name = 'books';
-
-	/**
-	 * String used to alias the database table in MySQL statements
-	 *
-	 * @var string
-	 */
-	protected $table_alias = 'book';
-
-	/**
-	 * Name of class used to set up the database schema
-	 *
-	 * @var string
-	 */
-	protected $table_schema = '\\Book_Database\\Books_Schema';
-
-	/**
-	 * Name for a single item
-	 *
-	 * @var string
-	 */
-	protected $item_name = 'book';
-
-	/**
-	 * Plural version for a group of items
-	 *
-	 * @var string
-	 */
-	protected $item_name_plural = 'books';
-
-	/**
-	 * Class name to turn IDs into these objects
-	 *
-	 * @var string
-	 */
-	protected $item_shape = '\\Book_Database\\Book';
-
-	/**
-	 * Group to cache queries and queried items to
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'books';
-
-	/**
-	 * Query constructor.
-	 *
-	 * @param array $args
-	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( $args );
-	}
-
-	/**
-	 * Query for books
-	 *
-	 * @param array $args
-	 *
-	 * @return object[]|int
-	 */
-	public function get_books( $args = array() ) {
-
-		$args = wp_parse_args( $args, array(
-			'author_query'      => array(),
-			'book_query'        => array(),
-			'series_query'      => array(),
-			'reading_log_query' => array(),
-			'review_query'      => array(),
-			'edition_query'     => array(),
-			'tax_query'         => array(),
-			'unread'            => false,
-			'orderby'           => 'book.id',
-			'order'             => 'DESC',
-			'include_rating'    => true,
-			'include_review'    => false, // Whether or not to always include review data.
-			'number'            => 20,
-			'offset'            => 0,
-			'count'             => false
-		) );
-
-		$select = $join = $where = array();
-
-		$clause_engine = new Where_Clause();
-
-		$tbl_books    = book_database()->get_table( 'books' )->get_table_name();
-		$tbl_author   = book_database()->get_table( 'authors' )->get_table_name();
-		$tbl_author_r = book_database()->get_table( 'book_author_relationships' )->get_table_name();
-		$tbl_ed       = book_database()->get_table( 'editions' )->get_table_name();
-		$tbl_log      = book_database()->get_table( 'reading_log' )->get_table_name();
-		$tbl_series   = book_database()->get_table( 'series' )->get_table_name();
-		$tbl_reviews  = book_database()->get_table( 'reviews' )->get_table_name();
-
-		// Select
-		$select = array(
-			'book.*',
-			"GROUP_CONCAT( DISTINCT author.id SEPARATOR ',' ) as author_id",
-			"GROUP_CONCAT( DISTINCT author.name SEPARATOR ',' ) as author_name",
-			'series.id as series_id',
-			'series.name as series_name'
-		);
-
-		// Author Join
-		$join['author_query'] = "LEFT JOIN {$tbl_author_r} AS ar ON book.id = ar.book_id LEFT JOIN {$tbl_author} AS author ON ar.author_id = author.id";
-
-		// Series Join
-		$join['series_query'] = "LEFT JOIN {$tbl_series} AS series ON book.series_id = series.id";
-
-		// Average Rating
-		if ( ! empty( $args['include_rating'] ) ) {
-			$join['average_rating_select'] = "LEFT JOIN {$tbl_log} AS avg_rating ON (book.id = avg_rating.book_id AND avg_rating.rating IS NOT NULL)";
-			$select[]                      = 'ROUND( AVG( avg_rating.rating ), 2 ) as avg_rating';
-		}
-
-		/**
-		 * Where
-		 */
-
-		// Author query
-		if ( ! empty( $args['author_query'] ) ) {
-			$clause_engine->set_table_query( new Authors_Query() );
-			$clause_engine->set_args( $args['author_query'] );
-			$where = array_merge( $where, $clause_engine->get_clauses() );
-		}
-
-		// Book query
-		if ( ! empty( $args['book_query'] ) ) {
-			$clause_engine->set_table_query( $this );
-			$clause_engine->set_args( $args['book_query'] );
-			$where = array_merge( $where, $clause_engine->get_clauses() );
-		}
-
-		// Edition query
-		if ( ! empty( $args['edition_query'] ) ) {
-			$join['edition_query'] = "INNER JOIN {$tbl_ed} AS ed ON (book.id = ed.book_id)";
-			$clause_engine->set_table_query( new Editions_Query() );
-			$clause_engine->set_args( $args['edition_query'] );
-			$where = array_merge( $where, $clause_engine->get_clauses() );
-		}
-
-		// Reading log query
-		if ( ! empty( $args['reading_log_query'] ) ) {
-			$join['reading_log_query'] = "INNER JOIN {$tbl_log} AS log ON (book.id = log.book_id)";
-			$clause_engine->set_table_query( new Reading_Logs_Query() );
-			$clause_engine->set_args( $args['reading_log_query'] );
-			$where    = array_merge( $where, $clause_engine->get_clauses() );
-			$select[] = 'log.id AS log_id, log.user_id AS log_user_id, log.date_started AS date_started, log.date_finished AS date_finished, log.percentage_complete AS percentage_complete, log.rating AS rating';
-		}
-
-		// Review query
-		if ( ! empty( $args['review_query'] ) ) {
-			$join['review_query'] = "INNER JOIN {$tbl_reviews} AS review ON (book.id = review.book_id)";
-			$clause_engine->set_table_query( new Reviews_Query() );
-			$clause_engine->set_args( $args['review_query'] );
-			$where = array_merge( $where, $clause_engine->get_clauses() );
-		} elseif ( ! empty( $args['include_review'] ) ) {
-			// Include review data, but as a LEFT JOIN.
-			$join['review_query'] = "LEFT JOIN {$tbl_reviews} AS review ON (book.id = review.book_id)";
-		}
-
-		// Unread books only
-		// This is a bit "special" because we need a weird left join.
-		if ( ! empty( $args['unread'] ) ) {
-			$join['unread_query'] = "LEFT JOIN {$tbl_log} as ulog ON (book.id = ulog.book_id)";
-			$where[]              = 'ulog.book_id IS NULL';
-		}
-
-		// Series query
-		if ( ! empty( $args['series_query'] ) ) {
-			$clause_engine->set_table_query( new Series_Query() );
-			$clause_engine->set_args( $args['series_query'] );
-			$where = array_merge( $where, $clause_engine->get_clauses() );
-		}
-
-		// Tax query
-		if ( ! empty( $args['tax_query'] ) ) {
-			$tax_query          = new Tax( $args['tax_query'] );
-			$clauses            = $tax_query->get_sql( $this->table_alias, 'id' );
-			$join['tax_query']  = $clauses['join'];
-			$where['tax_query'] = preg_replace( '/^\s*AND\s*/', '', $clauses['where'] );
-		}
-
-		// Select review data if we have a review query.
-		if ( ( ! empty( $args['review_query'] ) || ! empty( $args['include_review'] ) ) && ! empty( $join['review_query'] ) ) {
-			$select[] = 'review.id AS review_id, review.user_id AS review_user_id, review.post_id AS review_post_id, review.url AS review_url, review.date_written AS review_date_written, review.date_published AS review_date_published';
-		}
-
-		/**
-		 * Format and query
-		 */
-		$select = implode( ', ', $select );
-		$join   = implode( ' ', $join );
-		$where  = ! empty( $where ) ? 'WHERE ' . implode( ' AND ', $where ) : '';
-
-		/**
-		 * Validate the orderby / order
-		 */
-		$orderby = $this->validate_orderby( $args['orderby'], $args );
-		$order   = 'ASC' === strtoupper( $args['order'] ) ? 'ASC' : 'DESC';
-
-		$group_by = 'GROUP BY book.id';
-
-		// Override select if we're counting.
-		if ( ! empty( $args['count'] ) ) {
-			$select   = 'COUNT( DISTINCT book.id )';
-			$group_by = '';
-		}
-
-		if ( ! empty( $args['count'] ) ) {
-			$query = "SELECT {$select} FROM {$tbl_books} AS book {$join} {$where}";
-
-			$books = $this->get_db()->get_var( $query );
-
-			return absint( $books );
-		}
-
-		$query = $this->get_db()->prepare( "SELECT {$select} FROM {$tbl_books} AS book {$join} {$where} {$group_by} ORDER BY $orderby $order LIMIT %d,%d;", absint( $args['offset'] ), absint( $args['number'] ) );
-
-		$books = $this->get_db()->get_results( $query );
-
-		return wp_unslash( $books );
-
-	}
-
-	/**
-	 * Validate the orderby
-	 *
-	 * @param string $orderby Desired orderby.
-	 * @param array  $args    Query arguments.
-	 *
-	 * @return string
-	 */
-	protected function validate_orderby( $orderby, $args = array() ) {
-
-		$valid_orderbys = array(
-			'author.id',
-			'author.name',
-			'author.slug',
-			'book.id',
-			'book.title',
-			'book.index_title',
-			'book.series_id',
-			'book.series_position',
-			'book.pub_date',
-			'book.pages',
-			'book.date_created',
-			'book.date_modified',
-			'series.id',
-			'series.name',
-			'series.slug',
-			'series.number_books',
-			'series.date_created',
-		);
-		if ( ! empty( $args['include_rating'] ) ) {
-			$valid_orderbys = $valid_orderbys + array(
-					'avg_rating.id',
-					'avg_rating.review_id',
-					'avg_rating.user_id',
-					'avg_rating.date_started',
-					'avg_rating.date_finished',
-					'avg_rating.percentage_complete',
-					'avg_rating.rating'
-				);
-		}
-		if ( ! empty( $args['reading_log_query'] ) ) {
-			$valid_orderbys = $valid_orderbys + array(
-					'log.date_started',
-					'log.date_finished',
-					'log.percentage_complete'
-				);
-		}
-
-		return in_array( $orderby, $valid_orderbys ) ? $orderby : 'book.id';
-
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/books/class-books-schema.php b/includes/database/books/class-books-schema.php
deleted file mode 100644
index f18c239b..00000000
--- a/includes/database/books/class-books-schema.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * Books Schema
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Books_Schema
- *
- * @package Book_Database
- */
-class Books_Schema extends BerlinDB\Database\Schema {
-
-	/**
-	 * Array of database columns
-	 *
-	 * @var array
-	 */
-	public $columns = array(
-
-		// id
-		array(
-			'name'     => 'id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'extra'    => 'auto_increment',
-			'primary'  => true,
-			'sortable' => true
-		),
-
-		// cover_id
-		array(
-			'name'       => 'cover_id',
-			'type'       => 'bigint',
-			'length'     => '20',
-			'unsigned'   => true,
-			'sortable'   => true,
-			'allow_null' => true,
-			'default'    => null,
-			'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
-		),
-
-		// title
-		array(
-			'name'       => 'title',
-			'type'       => 'text',
-			'sortable'   => true,
-			'searchable' => true,
-			'default'    => '',
-			'validate'   => 'sanitize_text_field'
-		),
-
-		// index_title
-		array(
-			'name'       => 'index_title',
-			'type'       => 'text',
-			'sortable'   => true,
-			'searchable' => true,
-			'default'    => '',
-			'validate'   => 'sanitize_text_field'
-		),
-
-		// series_id
-		array(
-			'name'       => 'series_id',
-			'type'       => 'bigint',
-			'length'     => '20',
-			'unsigned'   => true,
-			'sortable'   => true,
-			'allow_null' => true,
-			'default'    => null,
-			'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
-		),
-
-		// series_position
-		array(
-			'name'       => 'series_position',
-			'type'       => 'float',
-			'sortable'   => true,
-			'allow_null' => true,
-			'default'    => null,
-			'validate'   => '\Book_Database\BerlinDB\Sanitization\floatval_int_allow_null'
-		),
-
-		// pub_date
-		array(
-			'name'       => 'pub_date',
-			'type'       => 'date',
-			'sortable'   => true,
-			'date_query' => true,
-			'validate'   => '\Book_Database\BerlinDB\Sanitization\validate_date'
-		),
-
-		// pages
-		array(
-			'name'       => 'pages',
-			'type'       => 'bigint',
-			'length'     => '20',
-			'unsigned'   => true,
-			'sortable'   => true,
-			'allow_null' => true,
-			'default'    => null,
-			'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
-		),
-
-		// synopsis
-		array(
-			'name'     => 'synopsis',
-			'type'     => 'longtext',
-			'validate' => 'wp_kses_post'
-		),
-
-		// goodreads_url
-		array(
-			'name'     => 'goodreads_url',
-			'type'     => 'text',
-			'validate' => 'sanitize_text_field'
-		),
-
-		// date_created
-		array(
-			'name'       => 'date_created',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'created'    => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-		// date_modified
-		array(
-			'name'       => 'date_modified',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'modified'   => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-	);
-
-}
\ No newline at end of file
diff --git a/includes/database/books/class-books-table.php b/includes/database/books/class-books-table.php
deleted file mode 100644
index d5d2304e..00000000
--- a/includes/database/books/class-books-table.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/**
- * Books Table
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Books_Table
- *
- * @package Book_Database
- */
-class Books_Table extends BerlinDB\Database\Table {
-
-	/**
-	 * @var string Table name
-	 */
-	protected $name = 'books';
-
-	/**
-	 * @var int Database version in format {YYYY}{MM}{DD}{1}
-	 */
-	protected $version = 201910271;
-
-	/**
-	 * @var array Upgrades to perform
-	 */
-	protected $upgrades = array(
-		'201910092' => 201910092,
-		'201910093' => 201910093,
-		'201910094' => 201910094,
-		'201910095' => 201910095,
-		'201910096' => 201910096,
-		'201910271' => 201910271
-	);
-
-	/**
-	 * Books_Table constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-	}
-
-	/**
-	 * Set up the database schema
-	 */
-	protected function set_schema() {
-		$this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-			cover_id bigint(20) UNSIGNED DEFAULT NULL,
-			title text NOT NULL,
-			index_title text NOT NULL,
-			series_id bigint(20) UNSIGNED DEFAULT NULL,
-			series_position float DEFAULT NULL,
-			pub_date date DEFAULT NULL,
-			pages bigint(20) UNSIGNED DEFAULT NULL,
-			synopsis longtext NOT NULL,
-			goodreads_url text NOT NULL,
-			date_created datetime NOT NULL,
-			date_modified datetime NOT NULL,
-			INDEX title( title(64) ),
-			INDEX series_id ( series_id )";
-	}
-
-	/**
-	 * If the old `wp_bdb_books_db_version` option exists, copy that value to our new version key.
-	 * This will ensure new upgrades are processed on old installs.
-	 */
-	public function maybe_upgrade() {
-
-		$old_key     = $this->get_db()->prefix . 'bdb_books_db_version';
-		$old_version = get_option( $old_key );
-
-		if ( false !== $old_version ) {
-			update_option( $this->db_version_key, get_option( $old_key ) );
-
-			delete_option( $old_key );
-		}
-
-		return parent::maybe_upgrade();
-	}
-
-	/**
-	 * Upgrade to version 201910092
-	 *      - Rename `ID` to `id` & add `unsigned`
-	 *
-	 * @return bool
-	 */
-	protected function __201910092() {
-
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} CHANGE `ID` `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT" );
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910093
-	 *      - Rename `cover` to `cover_id` & add `unsigned`
-	 *
-	 * @return bool
-	 */
-	protected function __201910093() {
-
-		if ( $this->column_exists( 'cover' ) ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} CHANGE `cover` `cover_id` bigint(20) UNSIGNED DEFAULT NULL" );
-		} else {
-			$result = true;
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910094
-	 *      - Add `unsigned` to `series_id` and `pages`
-	 *
-	 * @return bool
-	 */
-	protected function __201910094() {
-
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} MODIFY series_id bigint(20) UNSIGNED DEFAULT NULL" );
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} MODIFY pages bigint(20) UNSIGNED DEFAULT NULL" );
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910095
-	 *      - Add `date_created` column
-	 *      - Add `date_modified` column
-	 *
-	 * @return bool
-	 */
-	protected function __201910095() {
-
-		$result = $this->column_exists( 'date_created' );
-
-		if ( ! $result ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD COLUMN date_created datetime NOT NULL DEFAULT '0000-00-00 00:00:00'" );
-		}
-
-		$result = $this->column_exists( 'date_modified' );
-
-		if ( ! $result ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD COLUMN date_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00'" );
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910096
-	 *      - Add `title` index
-	 *
-	 * @return bool
-	 */
-	protected function __201910096() {
-
-		if ( ! $this->get_db()->query( "SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'title'" ) ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD INDEX title( title(64) )" );
-		} else {
-			$result = true;
-		}
-
-		return $result;
-
-	}
-
-	/**
-	 * Upgrade to version 201910271
-	 *      - Convert `pub_date` to a DATE field
-	 *
-	 * @return bool
-	 */
-	protected function __201910271() {
-
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} MODIFY pub_date date DEFAULT NULL" );
-
-		return $this->is_success( $result );
-
-	}
-
-}
diff --git a/includes/database/editions/class-editions-query.php b/includes/database/editions/class-editions-query.php
deleted file mode 100644
index 7b160c12..00000000
--- a/includes/database/editions/class-editions-query.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Editions Query
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Editions_Query
- * @package Book_Database
- */
-class Editions_Query extends BerlinDB\Database\Query {
-
-	/**
-	 * Name of the table to query
-	 *
-	 * @var string
-	 */
-	protected $table_name = 'owned_editions';
-
-	/**
-	 * String used to alias the database table in MySQL statements
-	 *
-	 * @var string
-	 */
-	protected $table_alias = 'ed';
-
-	/**
-	 * Name of class used to set up the database schema
-	 *
-	 * @var string
-	 */
-	protected $table_schema = '\\Book_Database\\Editions_Schema';
-
-	/**
-	 * Name for a single item
-	 *
-	 * @var string
-	 */
-	protected $item_name = 'edition';
-
-	/**
-	 * Plural version for a group of items
-	 *
-	 * @var string
-	 */
-	protected $item_name_plural = 'editions';
-
-	/**
-	 * Class name to turn IDs into these objects
-	 *
-	 * @var string
-	 */
-	protected $item_shape = '\\Book_Database\\Edition';
-
-	/**
-	 * Group to cache queries and queried items to
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'editions';
-
-	/**
-	 * Query constructor.
-	 *
-	 * @param array $args
-	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( $args );
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/editions/class-editions-schema.php b/includes/database/editions/class-editions-schema.php
deleted file mode 100644
index 3cb71d78..00000000
--- a/includes/database/editions/class-editions-schema.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * Editions Schema
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Editions_Schema
- *
- * @package Book_Database
- */
-class Editions_Schema extends BerlinDB\Database\Schema {
-
-	/**
-	 * Array of database columns
-	 *
-	 * @var array
-	 */
-	public $columns = array(
-
-		// id
-		array(
-			'name'     => 'id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'extra'    => 'auto_increment',
-			'primary'  => true,
-			'sortable' => true
-		),
-
-		// book_id
-		array(
-			'name'     => 'book_id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'sortable' => true
-		),
-
-		// isbn
-		array(
-			'name'     => 'isbn',
-			'type'     => 'varchar',
-			'length'   => '13',
-			'sortable' => true,
-			'validate' => 'sanitize_text_field'
-		),
-
-		// format
-		array(
-			'name'     => 'format',
-			'type'     => 'varchar',
-			'length'   => '13',
-			'validate' => 'sanitize_text_field'
-		),
-
-		// date_acquired
-		array(
-			'name'       => 'date_acquired',
-			'type'       => 'datetime',
-			'default'    => null,
-			'allow_null' => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-		// source_id
-		array(
-			'name'       => 'source_id',
-			'type'       => 'bigint',
-			'length'     => '20',
-			'unsigned'   => true,
-			'sortable'   => true,
-			'default'    => null,
-			'allow_null' => true,
-			'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
-		),
-
-		// signed
-		array(
-			'name'       => 'signed',
-			'type'       => 'int',
-			'length'     => '1',
-			'unsigned'   => true,
-			'sortable'   => true,
-			'allow_null' => true,
-			'default'    => null,
-			'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
-		),
-
-		// date_created
-		array(
-			'name'       => 'date_created',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'created'    => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-		// date_modified
-		array(
-			'name'       => 'date_modified',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'modified'   => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-	);
-
-}
\ No newline at end of file
diff --git a/includes/database/editions/class-editions-table.php b/includes/database/editions/class-editions-table.php
deleted file mode 100644
index 4952a042..00000000
--- a/includes/database/editions/class-editions-table.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/**
- * Editions Table
- *
- * @todo      Consider `format` table.
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Editions_Table
- *
- * @package Book_Database
- */
-class Editions_Table extends BerlinDB\Database\Table {
-
-	/**
-	 * @var string Table name
-	 */
-	protected $name = 'owned_editions';
-
-	/**
-	 * @var int Database version in format {YYYY}{MM}{DD}{1}
-	 */
-	protected $version = 202002231;
-
-	/**
-	 * @var array Upgrades to perform
-	 */
-	protected $upgrades = array(
-		'201910132' => 201910132,
-		'201910133' => 201910133,
-		'201910134' => 201910134,
-		'201910135' => 201910135,
-		'201910141' => 201910141,
-		'202002231' => 202002231
-	);
-
-	/**
-	 * Owned_Editions_Table constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-	}
-
-	/**
-	 * Set up the database schema
-	 */
-	protected function set_schema() {
-		$this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-			book_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
-			isbn varchar(13) NOT NULL DEFAULT '',
-			format varchar(200) NOT NULL DEFAULT '',
-			date_acquired datetime DEFAULT NULL,
-			source_id bigint(20) UNSIGNED DEFAULT NULL,
-			signed int(1) UNSIGNED DEFAULT NULL,
-			date_created datetime NOT NULL,
-			date_modified datetime NOT NULL,
-			INDEX book_id (book_id),
-			INDEX isbn (isbn),
-			INDEX date_acquired (date_acquired)";
-	}
-
-	/**
-	 * If the old `wp_bdb_owned_editions_db_version` option exists, copy that value to our new version key.
-	 * This will ensure new upgrades are processed on old installs.
-	 */
-	public function maybe_upgrade() {
-
-		$old_key     = $this->get_db()->prefix . 'bdb_owned_editions_db_version';
-		$old_version = get_option( $old_key );
-
-		if ( false !== $old_version ) {
-			update_option( $this->db_version_key, get_option( $old_key ) );
-
-			delete_option( $old_key );
-		}
-
-		return parent::maybe_upgrade();
-
-	}
-
-	/**
-	 * Upgrade to version 201910132
-	 *      - Rename `ID` to `id` & add `unsigned`
-	 *
-	 * @return bool
-	 */
-	protected function __201910132() {
-
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} CHANGE `ID` `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT" );
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910133
-	 *      - Rename `source` to `source_id` & add `unsigned`
-	 *
-	 * @return bool
-	 */
-	protected function __201910133() {
-
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} CHANGE `source` source_id bigint(20) UNSIGNED DEFAULT NULL" );
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910134
-	 *      - Add `date_created` column
-	 *      - Add `date_modified` column
-	 *
-	 * @return bool
-	 */
-	protected function __201910134() {
-
-		$result = $this->column_exists( 'date_created' );
-
-		if ( ! $result ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD COLUMN date_created datetime NOT NULL DEFAULT '0000-00-00 00:00:00'" );
-		}
-
-		$result = $this->column_exists( 'date_modified' );
-
-		if ( ! $result ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD COLUMN date_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00'" );
-		}
-
-		return $result;
-
-	}
-
-	/**
-	 * Upgrade to version 201910135
-	 *      - Add `isbn` index
-	 *
-	 * @return bool
-	 */
-	protected function __201910135() {
-
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD INDEX isbn (isbn)" );
-
-		return $result;
-
-	}
-
-	/**
-	 * Upgrade to version 201910141
-	 *      - Add `date_acquired` index
-	 *
-	 * @return bool
-	 */
-	protected function __201910141() {
-
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD INDEX date_acquired (date_acquired)" );
-
-		return $result;
-
-	}
-
-	/**
-	 * Upgrade to version 202002231
-	 *      - Allow `date_acquired` to be `null`.
-	 *
-	 * @return bool
-	 */
-	protected function __202002231() {
-
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} MODIFY date_acquired datetime DEFAULT NULL" );
-
-		return $this->is_success( $result );
-
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/engine/query.php b/includes/database/engine/query.php
index d6a58e3d..27682a4a 100644
--- a/includes/database/engine/query.php
+++ b/includes/database/engine/query.php
@@ -1922,7 +1922,7 @@ public function get_item_by( $column_name = '', $column_value = '' ) {
 	 * @since 1.0.0
 	 *
 	 * @param array $data
-	 * @return bool
+	 * @return int|false
 	 */
 	public function add_item( $data = array() ) {
 
@@ -3167,4 +3167,4 @@ public function get_results( $cols = array(), $where_cols = array(), $limit = 25
 		// Return results.
 		return $results;
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/database/reading-logs/class-reading-logs-query.php b/includes/database/reading-logs/class-reading-logs-query.php
deleted file mode 100644
index 62300bad..00000000
--- a/includes/database/reading-logs/class-reading-logs-query.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Reading Logs Query
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Reading_Logs_Query
- * @package Book_Database
- */
-class Reading_Logs_Query extends BerlinDB\Database\Query {
-
-	/**
-	 * Name of the table to query
-	 *
-	 * @var string
-	 */
-	protected $table_name = 'reading_log';
-
-	/**
-	 * String used to alias the database table in MySQL statements
-	 *
-	 * @var string
-	 */
-	protected $table_alias = 'log';
-
-	/**
-	 * Name of class used to set up the database schema
-	 *
-	 * @var string
-	 */
-	protected $table_schema = '\\Book_Database\\Reading_Logs_Schema';
-
-	/**
-	 * Name for a single item
-	 *
-	 * @var string
-	 */
-	protected $item_name = 'reading_log';
-
-	/**
-	 * Plural version for a group of items
-	 *
-	 * @var string
-	 */
-	protected $item_name_plural = 'reading_logs';
-
-	/**
-	 * Class name to turn IDs into these objects
-	 *
-	 * @var string
-	 */
-	protected $item_shape = '\\Book_Database\\Reading_Log';
-
-	/**
-	 * Group to cache queries and queried items to
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'reading_logs';
-
-	/**
-	 * Query constructor.
-	 *
-	 * @param array $args
-	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( $args );
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/reading-logs/class-reading-logs-schema.php b/includes/database/reading-logs/class-reading-logs-schema.php
deleted file mode 100644
index 10065191..00000000
--- a/includes/database/reading-logs/class-reading-logs-schema.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * Reading Logs Schema
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Reading_Logs_Schema
- *
- * @package Book_Database
- */
-class Reading_Logs_Schema extends BerlinDB\Database\Schema {
-
-	/**
-	 * Array of database columns
-	 *
-	 * @var array
-	 */
-	public $columns = array(
-
-		// id
-		array(
-			'name'     => 'id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'extra'    => 'auto_increment',
-			'primary'  => true,
-			'sortable' => true
-		),
-
-		// book_id
-		array(
-			'name'     => 'book_id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'sortable' => true,
-			'default'  => 0
-		),
-
-		// edition_id
-		array(
-			'name'       => 'edition_id',
-			'type'       => 'bigint',
-			'length'     => '20',
-			'unsigned'   => true,
-			'sortable'   => true,
-			'allow_null' => true,
-			'default'    => null,
-			'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
-		),
-
-		// user_id
-		array(
-			'name'     => 'user_id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'sortable' => true,
-			'default'  => 0
-		),
-
-		// date_started
-		array(
-			'name'       => 'date_started',
-			'type'       => 'datetime',
-			'sortable'   => true,
-			'date_query' => true,
-			'allow_null' => true,
-			'default'    => null
-		),
-
-		// date_finished
-		array(
-			'name'       => 'date_finished',
-			'type'       => 'datetime',
-			'sortable'   => true,
-			'date_query' => true,
-			'allow_null' => true,
-			'default'    => null
-		),
-
-		// percentage_complete
-		array(
-			'name'     => 'percentage_complete',
-			'type'     => 'decimal',
-			'length'   => '5,4',
-			'unsigned' => true,
-			'sortable' => true,
-			'default'  => 0.00,
-		),
-
-		// rating
-		array(
-			'name'       => 'rating',
-			'type'       => 'decimal',
-			'length'     => '4,2',
-			'unsigned'   => true,
-			'sortable'   => true,
-			'allow_null' => true,
-			'default'    => null
-		),
-
-		// date_modified
-		array(
-			'name'       => 'date_modified',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'modified'   => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-	);
-
-}
\ No newline at end of file
diff --git a/includes/database/reading-logs/class-reading-logs-table.php b/includes/database/reading-logs/class-reading-logs-table.php
deleted file mode 100644
index cc620d83..00000000
--- a/includes/database/reading-logs/class-reading-logs-table.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/**
- * Reading Logs Table Table
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Reading_Logs_Table
- *
- * @package Book_Database
- */
-class Reading_Logs_Table extends BerlinDB\Database\Table {
-
-	/**
-	 * @var string Table name
-	 */
-	protected $name = 'reading_log';
-
-	/**
-	 * @var int Database version in format {YYYY}{MM}{DD}{1}
-	 */
-	protected $version = 202001281;
-
-	/**
-	 * @var array Upgrades to perform
-	 */
-	protected $upgrades = array(
-		'201910132' => 201910132,
-		'201910133' => 201910133,
-		'201910141' => 201910141,
-		'201910142' => 201910142,
-		'202001281' => 202001281
-	);
-
-	/**
-	 * Books_Table constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-	}
-
-	/**
-	 * Set up the database schema
-	 */
-	protected function set_schema() {
-		$this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-			book_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
-			edition_id bigint(20) UNSIGNED DEFAULT NULL,
-			user_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
-			date_started datetime DEFAULT NULL,
-			date_finished datetime DEFAULT NULL,
-			percentage_complete decimal(5,4) UNSIGNED NOT NULL DEFAULT 0.00,
-			rating decimal(4,2) DEFAULT NULL,
-			date_modified datetime NOT NULL,
-			INDEX book_id (book_id),
-			INDEX percentage_complete (percentage_complete),
-			INDEX date_finished_book_id (date_finished, book_id),
-			INDEX date_finished_percentage_complete (date_finished, percentage_complete),
-			INDEX date_finished_rating (date_finished, rating),
-			INDEX date_started (date_started),
-			INDEX rating_book_id (rating, book_id),
-			INDEX user_id (user_id)";
-	}
-
-	/**
-	 * If the old `wp_bdb_reading_list_db_version` option exists, copy that value to our new version key.
-	 * This will ensure new upgrades are processed on old installs.
-	 */
-	public function maybe_upgrade() {
-
-		$old_key     = $this->get_db()->prefix . 'bdb_reading_list_db_version';
-		$old_version = get_option( $old_key );
-
-		if ( false !== $old_version ) {
-			update_option( $this->db_version_key, get_option( $old_key ) );
-
-			delete_option( $old_key );
-		}
-
-		return parent::maybe_upgrade();
-	}
-
-	/**
-	 * Upgrade to version 201910132
-	 *      - Rename `ID` to `id` & add `unsigned`
-	 *
-	 * @return bool
-	 */
-	protected function __201910132() {
-
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} CHANGE `ID` `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT" );
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910133
-	 *      - Add `date_modified` column
-	 *
-	 * @return bool
-	 */
-	protected function __201910133() {
-
-		$result = $this->column_exists( 'date_modified' );
-
-		if ( ! $result ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD COLUMN date_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00'" );
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910141
-	 *      - Change `complete` to `percentage_complete`
-	 *
-	 * @return bool
-	 */
-	protected function __201910141() {
-
-		if ( $this->get_db()->query( "SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'complete'" ) ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} DROP INDEX complete" );
-		} else {
-			$result = true;
-		}
-
-		if ( $result ) {
-			if ( ! $this->column_exists( 'percentage_complete' ) ) {
-				// First change to `float`.
-				$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} CHANGE `complete` `percentage_complete` float UNSIGNED NOT NULL DEFAULT 0" );
-
-				if ( $result ) {
-					// Now change to divide by 100.
-					$result = $this->get_db()->query( "UPDATE {$this->table_name} SET percentage_complete = percentage_complete / 100 WHERE percentage_complete > 0" );
-
-					// Now change to decimal.
-					if ( $result ) {
-						$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} MODIFY `percentage_complete` decimal(5,4) UNSIGNED NOT NULL DEFAULT 0" );
-
-						// Now add an index.
-						if ( ! $this->get_db()->query( "SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'percentage_complete'" ) ) {
-							$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD INDEX percentage_complete (percentage_complete)" );
-						}
-					}
-				}
-			}
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910142
-	 *      - Remove `dnf` rating values
-	 *      - Change `rating` to `decimal(4,2)`
-	 *
-	 * @return bool
-	 */
-	protected function __201910142() {
-
-		$result = $this->get_db()->query( "UPDATE {$this->table_name} SET rating = NULL WHERE rating = 'dnf'" );
-
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} MODIFY rating decimal(4,2) DEFAULT NULL" );
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 202001281
-	 *      - Add `edition_id` column
-	 *
-	 * @return bool
-	 */
-	protected function __202001281() {
-
-		$result = $this->column_exists( 'edition_id' );
-
-		if ( ! $result ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD COLUMN edition_id bigint(20) UNSIGNED DEFAULT NULL AFTER book_id" );
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/retailers/class-retailers-query.php b/includes/database/retailers/class-retailers-query.php
deleted file mode 100644
index 706b7e83..00000000
--- a/includes/database/retailers/class-retailers-query.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Retailers Query
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Retailers_Query
- * @package Book_Database
- */
-class Retailers_Query extends BerlinDB\Database\Query {
-
-	/**
-	 * Name of the table to query
-	 *
-	 * @var string
-	 */
-	protected $table_name = 'retailers';
-
-	/**
-	 * String used to alias the database table in MySQL statements
-	 *
-	 * @var string
-	 */
-	protected $table_alias = 'retailer';
-
-	/**
-	 * Name of class used to set up the database schema
-	 *
-	 * @var string
-	 */
-	protected $table_schema = '\\Book_Database\\Retailers_Schema';
-
-	/**
-	 * Name for a single item
-	 *
-	 * @var string
-	 */
-	protected $item_name = 'retailer';
-
-	/**
-	 * Plural version for a group of items
-	 *
-	 * @var string
-	 */
-	protected $item_name_plural = 'retailers';
-
-	/**
-	 * Class name to turn IDs into these objects
-	 *
-	 * @var string
-	 */
-	protected $item_shape = '\\Book_Database\\Retailer';
-
-	/**
-	 * Group to cache queries and queried items to
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'retailers';
-
-	/**
-	 * Query constructor.
-	 *
-	 * @param array $args
-	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( $args );
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/retailers/class-retailers-schema.php b/includes/database/retailers/class-retailers-schema.php
deleted file mode 100644
index 578deb6b..00000000
--- a/includes/database/retailers/class-retailers-schema.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Retailers Schema
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Retailers_Schema
- *
- * @package Book_Database
- */
-class Retailers_Schema extends BerlinDB\Database\Schema {
-
-	/**
-	 * Array of database columns
-	 *
-	 * @var array
-	 */
-	public $columns = array(
-
-		// id
-		array(
-			'name'     => 'id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'extra'    => 'auto_increment',
-			'primary'  => true,
-			'sortable' => true
-		),
-
-		// name
-		array(
-			'name'       => 'name',
-			'type'       => 'varchar',
-			'length'     => '200',
-			'sortable'   => true,
-			'searchable' => true,
-			'validate'   => 'sanitize_text_field'
-		),
-
-		// template
-		array(
-			'name'       => 'template',
-			'type'       => 'text',
-			'validate'   => 'wp_kses_post'
-		),
-
-		// date_created
-		array(
-			'name'       => 'date_created',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'created'    => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-		// date_modified
-		array(
-			'name'       => 'date_modified',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'modified'   => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-	);
-
-}
\ No newline at end of file
diff --git a/includes/database/retailers/class-retailers-table.php b/includes/database/retailers/class-retailers-table.php
deleted file mode 100644
index cb3838a2..00000000
--- a/includes/database/retailers/class-retailers-table.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Retailers Table
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Retailers_Table
- *
- * @package Book_Database
- */
-class Retailers_Table extends BerlinDB\Database\Table {
-
-	/**
-	 * @var string Table name
-	 */
-	protected $name = 'retailers';
-
-	/**
-	 * @var int Database version in format {YYYY}{MM}{DD}{1}
-	 */
-	protected $version = 201911021;
-
-	/**
-	 * @var array Upgrades to perform
-	 */
-	protected $upgrades = array(
-		'201911021' => 201911021
-	);
-
-	/**
-	 * Book_Taxonomies_Table constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-	}
-
-	/**
-	 * Set up the database schema
-	 */
-	protected function set_schema() {
-		$this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-			name varchar(200) NOT NULL DEFAULT '',
-			template text NOT NULL DEFAULT '',
-			date_created datetime NOT NULL,
-			date_modified datetime NOT NULL,
-			INDEX name (name)";
-	}
-
-	/**
-	 * Upgrade to version 201911021
-	 *      - add `template` column
-	 *
-	 * @return bool
-	 */
-	protected function __201911021() {
-
-		$result = $this->column_exists( 'template' );
-
-		if ( ! $result ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD COLUMN template text NOT NULL DEFAULT '' AFTER `name`" );
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/reviews/class-review-meta-table.php b/includes/database/reviews/class-review-meta-table.php
deleted file mode 100644
index e18df4ca..00000000
--- a/includes/database/reviews/class-review-meta-table.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * Review Meta Table
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Review_Meta_Table
- *
- * @package Book_Database
- */
-class Review_Meta_Table extends BerlinDB\Database\Table {
-
-	/**
-	 * @var string Table name
-	 */
-	protected $name = 'reviewmeta';
-
-	/**
-	 * @var int Database version in format {YYYY}{MM}{DD}{1}
-	 */
-	protected $version = 201910274;
-
-	/**
-	 * @var array Upgrades to perform
-	 */
-	protected $upgrades = array(
-		'201910272' => 201910272,
-		'201910273' => 201910273,
-		'201910274' => 201910274
-	);
-
-	/**
-	 * Reviews_Table constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-	}
-
-	/**
-	 * Set up the database schema
-	 */
-	protected function set_schema() {
-		$max_index_length = 191;
-		$this->schema     = "meta_id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-			bdb_review_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
-			meta_key varchar(255) DEFAULT NULL,
-			meta_value longtext DEFAULT NULL,
-			INDEX bdb_review_id (bdb_review_id),
-			INDEX meta_key (meta_key({$max_index_length}))";
-	}
-
-	/**
-	 * If the old `wp_bdb_reviewmeta_db_version` option exists, copy that value to our new version key.
-	 * This will ensure new upgrades are processed on old installs.
-	 */
-	public function maybe_upgrade() {
-
-		$old_key     = $this->get_db()->prefix . 'bdb_reviewmeta_db_version';
-		$old_version = get_option( $old_key );
-
-		if ( false !== $old_version ) {
-			update_option( $this->db_version_key, get_option( $old_key ) );
-
-			delete_option( $old_key );
-		}
-
-		return parent::maybe_upgrade();
-	}
-
-	/**
-	 * Upgrade to version 201910272
-	 *      - Drop the `review_id` index
-	 *
-	 * @return bool
-	 */
-	protected function __201910272() {
-
-		if ( $this->get_db()->query( "SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'review_id'" ) ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} DROP INDEX review_id" );
-		} else {
-			$result = true;
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910273
-	 *      - Rename `review_id` to `bdb_review_id` & add `unsigned`
-	 *
-	 * @return bool
-	 */
-	protected function __201910273() {
-
-		if ( $this->column_exists( 'review_id' ) ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} CHANGE `review_id` `bdb_review_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0" );
-		} else {
-			$result = true;
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910274
-	 *      - Add a new `bdb_review_id` index
-	 *
-	 * @return bool
-	 */
-	protected function __201910274() {
-
-		$result = $this->get_db()->query( "SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'bdb_review_id'" );
-
-		if ( ! $result ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD INDEX bdb_review_id (bdb_review_id)" );
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/reviews/class-reviews-query.php b/includes/database/reviews/class-reviews-query.php
deleted file mode 100644
index 5f9159cc..00000000
--- a/includes/database/reviews/class-reviews-query.php
+++ /dev/null
@@ -1,303 +0,0 @@
-<?php
-/**
- * Reviews Query
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-use Book_Database\BerlinDB\Database\Queries\Tax;
-
-/**
- * Class Reviews_Query
- * @package Book_Database
- */
-class Reviews_Query extends BerlinDB\Database\Query {
-
-	/**
-	 * Name of the table to query
-	 *
-	 * @var string
-	 */
-	protected $table_name = 'reviews';
-
-	/**
-	 * String used to alias the database table in MySQL statements
-	 *
-	 * @var string
-	 */
-	protected $table_alias = 'review';
-
-	/**
-	 * Name of class used to set up the database schema
-	 *
-	 * @var string
-	 */
-	protected $table_schema = '\\Book_Database\\Reviews_Schema';
-
-	/**
-	 * Name for a single item
-	 *
-	 * @var string
-	 */
-	protected $item_name = 'review';
-
-	/**
-	 * Plural version for a group of items
-	 *
-	 * @var string
-	 */
-	protected $item_name_plural = 'reviews';
-
-	/**
-	 * Class name to turn IDs into these objects
-	 *
-	 * @var string
-	 */
-	protected $item_shape = '\\Book_Database\\Review';
-
-	/**
-	 * Group to cache queries and queried items to
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'reviews';
-
-	/**
-	 * Query constructor.
-	 *
-	 * @param array $args
-	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( $args );
-	}
-
-	/**
-	 * Get the column in this table to join with the taxonomy terms column.
-	 *
-	 * @return string
-	 */
-	protected function get_tax_query_join_column_name() {
-		return 'book_id';
-	}
-
-	/**
-	 * Get the column in this table to join with the book column.
-	 *
-	 * @return string
-	 */
-	protected function get_author_query_join_column_name() {
-		return 'book_id';
-	}
-
-	/**
-	 * Query for reviews
-	 *
-	 * @param array $args
-	 *
-	 * @return object[]|int
-	 */
-	public function get_reviews( $args = array() ) {
-
-		$args = wp_parse_args( $args, array(
-			'author_query'      => array(),
-			'book_query'        => array(),
-			'series_query'      => array(),
-			'reading_log_query' => array(),
-			'review_query'      => array(),
-			'edition_query'     => array(),
-			'tax_query'         => array(),
-			'orderby'           => 'review.id',
-			'order'             => 'DESC',
-			'number'            => 20,
-			'offset'            => 0,
-			'count'             => false
-		) );
-
-		$select = $join = $where = array();
-
-		$clause_engine = new Where_Clause();
-
-		$tbl_books    = book_database()->get_table( 'books' )->get_table_name();
-		$tbl_author   = book_database()->get_table( 'authors' )->get_table_name();
-		$tbl_author_r = book_database()->get_table( 'book_author_relationships' )->get_table_name();
-		$tbl_ed       = book_database()->get_table( 'editions' )->get_table_name();
-		$tbl_log      = book_database()->get_table( 'reading_log' )->get_table_name();
-		$tbl_reviews  = book_database()->get_table( 'reviews' )->get_table_name();
-		$tbl_series   = book_database()->get_table( 'series' )->get_table_name();
-
-		// Select
-		$select = array(
-			'review.*',
-			'book.id as book_id',
-			'book.cover_id as book_cover_id',
-			'book.title as book_title',
-			'book.pub_date as book_pub_date',
-			'book.series_position as series_position',
-			"GROUP_CONCAT( DISTINCT author.id SEPARATOR ',' ) as author_id",
-			"GROUP_CONCAT( DISTINCT author.name SEPARATOR ',' ) as author_name",
-			'series.id as series_id',
-			'series.name as series_name',
-			'log.date_started as date_started_reading',
-			'log.date_finished as date_finished_reading',
-			'log.percentage_complete as percentage_complete',
-			'log.rating as rating',
-		);
-
-		// Book Join
-		$join['book_query'] = "LEFT JOIN {$tbl_books} AS book ON review.book_id = book.id";
-
-		// Author Join
-		$join['author_query'] = "LEFT JOIN {$tbl_author_r} AS ar ON review.book_id = ar.book_id LEFT JOIN {$tbl_author} AS author ON ar.author_id = author.id";
-
-		// Series Join
-		$join['series_query'] = "LEFT JOIN {$tbl_series} AS series ON book.series_id = series.id";
-
-		// Reading Log Join
-		$join['reading_log_query'] = "LEFT JOIN {$tbl_log} AS log ON log.id = review.reading_log_id";
-
-		/**
-		 * Where
-		 */
-
-		// Author query
-		if ( ! empty( $args['author_query'] ) ) {
-			$clause_engine->set_table_query( new Authors_Query() );
-			$clause_engine->set_args( $args['author_query'] );
-			$where = array_merge( $where, $clause_engine->get_clauses() );
-		}
-
-		// Book query
-		if ( ! empty( $args['book_query'] ) ) {
-			$clause_engine->set_table_query( new Books_Query() );
-			$clause_engine->set_args( $args['book_query'] );
-			$where = array_merge( $where, $clause_engine->get_clauses() );
-		}
-
-		// Edition query
-		if ( ! empty( $args['edition_query'] ) ) {
-			$join['edition_query'] = "INNER JOIN {$tbl_ed} AS ed ON (review.book_id = ed.book_id)";
-			$clause_engine->set_table_query( new Editions_Query() );
-			$clause_engine->set_args( $args['edition_query'] );
-			$where = array_merge( $where, $clause_engine->get_clauses() );
-		}
-
-		// Reading log query
-		if ( ! empty( $args['reading_log_query'] ) ) {
-			$clause_engine->set_table_query( new Reading_Logs_Query() );
-			$clause_engine->set_args( $args['reading_log_query'] );
-			$where = array_merge( $where, $clause_engine->get_clauses() );
-		}
-
-		// Review query
-		if ( ! empty( $args['review_query'] ) ) {
-			$clause_engine->set_table_query( $this );
-			$clause_engine->set_args( $args['review_query'] );
-			$where = array_merge( $where, $clause_engine->get_clauses() );
-		}
-
-		// Series query
-		if ( ! empty( $args['series_query'] ) ) {
-			$clause_engine->set_table_query( new Series_Query() );
-			$clause_engine->set_args( $args['series_query'] );
-			$where = array_merge( $where, $clause_engine->get_clauses() );
-		}
-
-		// Tax query
-		if ( ! empty( $args['tax_query'] ) ) {
-			$tax_query          = new Tax( $args['tax_query'] );
-			$clauses            = $tax_query->get_sql( $this->table_alias, 'book_id' );
-			$join['tax_query']  = $clauses['join'];
-			$where['tax_query'] = preg_replace( '/^\s*AND\s*/', '', $clauses['where'] );
-		}
-
-		/**
-		 * Format and query
-		 */
-		$select = implode( ', ', $select );
-		$join   = implode( ' ', $join );
-		$where  = ! empty( $where ) ? 'WHERE ' . implode( ' AND ', $where ) : '';
-
-		/**
-		 * Validate the orderby / order
-		 */
-		$orderby = $this->validate_orderby( $args['orderby'], $args );
-		$order   = 'ASC' === strtoupper( $args['order'] ) ? 'ASC' : 'DESC';
-
-		$group_by = 'GROUP BY review.id';
-
-		// Override select if we're counting.
-		if ( ! empty( $args['count'] ) ) {
-			$select   = 'COUNT( DISTINCT review.id )';
-			$group_by = '';
-		}
-
-		if ( ! empty( $args['count'] ) ) {
-			$query = "SELECT {$select} FROM {$tbl_reviews} AS review {$join} {$where}";
-
-			$reviews = $this->get_db()->get_var( $query );
-
-			return absint( $reviews );
-		}
-
-		$query = $this->get_db()->prepare( "SELECT {$select} FROM {$tbl_reviews} AS review {$join} {$where} {$group_by} ORDER BY $orderby $order LIMIT %d,%d;", absint( $args['offset'] ), absint( $args['number'] ) );
-
-		$reviews = $this->get_db()->get_results( $query );
-
-		return wp_unslash( $reviews );
-
-	}
-
-	/**
-	 * Validate the orderby
-	 *
-	 * @param string $orderby Desired orderby.
-	 * @param array  $args    Query arguments.
-	 *
-	 * @return string
-	 */
-	protected function validate_orderby( $orderby, $args = array() ) {
-
-		$valid_orderbys = array(
-			'review.id',
-			'review.book_id',
-			'review.reading_log_id',
-			'review.user_id',
-			'review.post_id',
-			'review.date_written',
-			'review.date_published',
-			'review.date_created',
-			'review.date_modified',
-			'author.id',
-			'author.name',
-			'author.slug',
-			'book.id',
-			'book.title',
-			'book.index_title',
-			'book.series_id',
-			'book.series_position',
-			'book.pub_date',
-			'book.pages',
-			'book.date_created',
-			'book.date_modified',
-			'series.id',
-			'series.name',
-			'series.slug',
-			'series.number_books',
-			'series.date_created',
-			'log.id',
-			'log.user_id',
-			'log.date_started',
-			'log.date_finished',
-			'log.percentage_complete',
-			'log.rating'
-		);
-
-		return in_array( $orderby, $valid_orderbys ) ? $orderby : 'review.id';
-
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/reviews/class-reviews-schema.php b/includes/database/reviews/class-reviews-schema.php
deleted file mode 100644
index 34dc03ec..00000000
--- a/includes/database/reviews/class-reviews-schema.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- * Reviews Schema
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Reviews_Schema
- *
- * @package Book_Database
- */
-class Reviews_Schema extends BerlinDB\Database\Schema {
-
-	/**
-	 * Array of database columns
-	 *
-	 * @var array
-	 */
-	public $columns = array(
-
-		// id
-		array(
-			'name'     => 'id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'extra'    => 'auto_increment',
-			'primary'  => true,
-			'sortable' => true
-		),
-
-		// book_id
-		array(
-			'name'     => 'book_id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'sortable' => true,
-			'validate' => 'absint'
-		),
-
-		// reading_log_id
-		array(
-			'name'       => 'reading_log_id',
-			'type'       => 'bigint',
-			'length'     => '20',
-			'unsigned'   => true,
-			'sortable'   => true,
-			'allow_null' => true,
-			'default'    => null,
-			'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
-		),
-
-		// user_id
-		array(
-			'name'     => 'user_id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'sortable' => true,
-			'validate' => 'absint'
-		),
-
-		// post_id
-		array(
-			'name'       => 'post_id',
-			'type'       => 'bigint',
-			'length'     => '20',
-			'unsigned'   => true,
-			'sortable'   => true,
-			'allow_null' => true,
-			'default'    => null,
-			'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
-		),
-
-		// url
-		array(
-			'name'     => 'url',
-			'type'     => 'mediumtext',
-			'default'  => '',
-			'validate' => 'sanitize_text_field'
-		),
-
-		// review
-		array(
-			'name'     => 'review',
-			'type'     => 'longtext',
-			'validate' => 'wp_kses_post'
-		),
-
-		// date_written
-		array(
-			'name'       => 'date_written',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'sortable'   => true,
-			'date_query' => true
-		),
-
-		// date_published
-		array(
-			'name'       => 'date_published',
-			'type'       => 'datetime',
-			'sortable'   => true,
-			'date_query' => true,
-			'allow_null' => true,
-			'default'    => null,
-		),
-
-		// date_created
-		array(
-			'name'       => 'date_created',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'created'    => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-		// date_modified
-		array(
-			'name'       => 'date_modified',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'modified'   => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-	);
-
-}
\ No newline at end of file
diff --git a/includes/database/reviews/class-reviews-table.php b/includes/database/reviews/class-reviews-table.php
deleted file mode 100644
index 31c6902e..00000000
--- a/includes/database/reviews/class-reviews-table.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/**
- * Reviews Table
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Reviews_Table
- *
- * @package Book_Database
- */
-class Reviews_Table extends BerlinDB\Database\Table {
-
-	/**
-	 * @var string Table name
-	 */
-	protected $name = 'reviews';
-
-	/**
-	 * @var int Database version in format {YYYY}{MM}{DD}{1}
-	 */
-	protected $version = 201910301;
-
-	/**
-	 * @var array Upgrades to perform
-	 */
-	protected $upgrades = array(
-		'201910181' => 201910181,
-		'201910182' => 201910182,
-		'201910183' => 201910183,
-		'201910184' => 201910184,
-		'201910185' => 201910185,
-		'201910261' => 201910261,
-		'201910301' => 201910301
-	);
-
-	/**
-	 * Reviews_Table constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-	}
-
-	/**
-	 * Set up the database schema
-	 */
-	protected function set_schema() {
-		$this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-			book_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
-			reading_log_id bigint(20) UNSIGNED DEFAULT NULL,
-			user_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
-			post_id bigint(20) UNSIGNED DEFAULT NULL,
-			url mediumtext NOT NULL DEFAULT '',
-			review longtext NOT NULL DEFAULT '',
-			date_written datetime NOT NULL,
-			date_published datetime DEFAULT NULL,
-			date_created datetime NOT NULL,
-			date_modified datetime NOT NULL,
-			INDEX book_id (book_id),
-			INDEX date_written_book_id (date_written, book_id),
-			INDEX date_written_id (date_written, id),
-			INDEX post_id (post_id),
-			INDEX user_id (user_id)";
-	}
-
-	/**
-	 * If the old `wp_bdb_reviews_db_version` option exists, copy that value to our new version key.
-	 * This will ensure new upgrades are processed on old installs.
-	 */
-	public function maybe_upgrade() {
-
-		$old_key     = $this->get_db()->prefix . 'bdb_reviews_db_version';
-		$old_version = get_option( $old_key );
-
-		if ( false !== $old_version ) {
-			update_option( $this->db_version_key, get_option( $old_key ) );
-
-			delete_option( $old_key );
-		}
-
-		return parent::maybe_upgrade();
-	}
-
-	/**
-	 * Upgrade to version 201910181
-	 *      - Drop the `date_written_ID` index
-	 *
-	 * @return bool
-	 */
-	protected function __201910181() {
-
-		if ( $this->get_db()->query( "SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'date_written_ID'" ) ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} DROP INDEX date_written_ID" );
-		} else {
-			$result = true;
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910182
-	 *      - Rename `ID` to `id` & add `unsigned`
-	 *
-	 * @return bool
-	 */
-	protected function __201910182() {
-
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} CHANGE `ID` `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT" );
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910183
-	 *      - Add a new `date_written_id` index
-	 *
-	 * @return bool
-	 */
-	protected function __201910183() {
-
-		$result = $this->get_db()->query( "SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'date_written_id'" );
-
-		if ( ! $result ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD INDEX date_written_id (date_written, id)" );
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910184
-	 *      - Add `date_created` column
-	 *      - Add `date_modified` column
-	 *
-	 * @return bool
-	 */
-	protected function __201910184() {
-
-		$result = $this->column_exists( 'date_created' );
-
-		if ( ! $result ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD COLUMN date_created datetime NOT NULL DEFAULT '0000-00-00 00:00:00'" );
-		}
-
-		$result = $this->column_exists( 'date_modified' );
-
-		if ( ! $result ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD COLUMN date_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00'" );
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910185
-	 *      - Change `book_id` column - add `unsigned`
-	 *      - Change `post_id` column - add `unsigned` and allow null
-	 *      - Change `user_id` column - add `unsigned`
-	 *
-	 * @return bool
-	 */
-	protected function __201910185() {
-
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} MODIFY book_id bigint(20) UNSIGNED NOT NULL DEFAULT 0" );
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} MODIFY post_id bigint(20) UNSIGNED DEFAULT NULL" );
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} MODIFY user_id bigint(20) UNSIGNED NOT NULL DEFAULT 0 AFTER book_id" );
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910261
-	 *      - Drop column `rating`
-	 *
-	 * @return bool
-	 */
-	protected function __201910261() {
-
-		if ( $this->column_exists( 'rating' ) ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} DROP COLUMN `rating`" );
-		} else {
-			$result = true;
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910301
-	 *      - Add `reading_log_id` column
-	 *
-	 * @return bool
-	 */
-	protected function __201910301() {
-
-		$result = $this->column_exists( 'reading_log_id' );
-
-		if ( ! $result ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD COLUMN reading_log_id bigint(20) UNSIGNED DEFAULT NULL AFTER book_id" );
-		}
-
-		return $this->is_success( $result );
-
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/series/class-series-query.php b/includes/database/series/class-series-query.php
deleted file mode 100644
index 99db9bfc..00000000
--- a/includes/database/series/class-series-query.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Series Query
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Series_Query
- * @package Book_Database
- */
-class Series_Query extends BerlinDB\Database\Query {
-
-	/**
-	 * Name of the table to query
-	 *
-	 * @var string
-	 */
-	protected $table_name = 'series';
-
-	/**
-	 * String used to alias the database table in MySQL statements
-	 *
-	 * @var string
-	 */
-	protected $table_alias = 'series';
-
-	/**
-	 * Name of class used to set up the database schema
-	 *
-	 * @var string
-	 */
-	protected $table_schema = '\\Book_Database\\Series_Schema';
-
-	/**
-	 * Name for a single item
-	 *
-	 * @var string
-	 */
-	protected $item_name = 'series';
-
-	/**
-	 * Plural version for a group of items
-	 *
-	 * @var string
-	 */
-	protected $item_name_plural = 'series';
-
-	/**
-	 * Class name to turn IDs into these objects
-	 *
-	 * @var string
-	 */
-	protected $item_shape = '\\Book_Database\\Series';
-
-	/**
-	 * Group to cache queries and queried items to
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'series';
-
-	/**
-	 * Query constructor.
-	 *
-	 * @param array $args
-	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( $args );
-	}
-
-}
\ No newline at end of file
diff --git a/includes/database/series/class-series-schema.php b/includes/database/series/class-series-schema.php
deleted file mode 100644
index 8ba182cd..00000000
--- a/includes/database/series/class-series-schema.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Series Schema Schema
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Series_Schema
- *
- * @package Book_Database
- */
-class Series_Schema extends BerlinDB\Database\Schema {
-
-	/**
-	 * Array of database columns
-	 *
-	 * @var array
-	 */
-	public $columns = array(
-
-		// id
-		array(
-			'name'     => 'id',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'extra'    => 'auto_increment',
-			'primary'  => true,
-			'sortable' => true
-		),
-
-		// name
-		array(
-			'name'       => 'name',
-			'type'       => 'varchar',
-			'length'     => '200',
-			'sortable'   => true,
-			'searchable' => true,
-			'validate'   => 'sanitize_text_field'
-		),
-
-		// slug
-		array(
-			'name'       => 'slug',
-			'type'       => 'varchar',
-			'length'     => '200',
-			'sortable'   => true,
-			'searchable' => true,
-			'validate'   => 'sanitize_key'
-		),
-
-		// description
-		array(
-			'name'     => 'description',
-			'type'     => 'longtext',
-			'validate' => 'wp_kses_post'
-		),
-
-		// number_books
-		array(
-			'name'     => 'number_books',
-			'type'     => 'bigint',
-			'length'   => '20',
-			'unsigned' => true,
-			'sortable' => true
-		),
-
-		// date_created
-		array(
-			'name'       => 'date_created',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'created'    => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-		// date_modified
-		array(
-			'name'       => 'date_modified',
-			'type'       => 'datetime',
-			'default'    => '', // True default is current time, set in query class
-			'modified'   => true,
-			'date_query' => true,
-			'sortable'   => true,
-		),
-
-	);
-
-}
\ No newline at end of file
diff --git a/includes/database/series/class-series-table.php b/includes/database/series/class-series-table.php
deleted file mode 100644
index 8323f2ca..00000000
--- a/includes/database/series/class-series-table.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * Series Table
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Series_Table
- *
- * @package Book_Database
- */
-class Series_Table extends BerlinDB\Database\Table {
-
-	/**
-	 * @var string Table name
-	 */
-	protected $name = 'series';
-
-	/**
-	 * @var int Database version in format {YYYY}{MM}{DD}{1}
-	 */
-	protected $version = 201910124;
-
-	/**
-	 * @var array Upgrades to perform
-	 */
-	protected $upgrades = array(
-		'201910122' => 201910122,
-		'201910123' => 201910123,
-		'201910124' => 201910124
-	);
-
-	/**
-	 * Series_Table constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-	}
-
-	/**
-	 * Set up the database schema
-	 */
-	protected function set_schema() {
-		$this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-			name varchar(200) NOT NULL DEFAULT '',
-			slug varchar(200) NOT NULL DEFAULT '',
-			description longtext NOT NULL DEFAULT '',
-			number_books bigint(20) UNSIGNED NOT NULL DEFAULT 0,
-			date_created datetime NOT NULL,
-			date_modified datetime NOT NULL,
-			INDEX name (name)";
-	}
-
-	/**
-	 * If the old `wp_bdb_series_db_version` option exists, copy that value to our new version key.
-	 * This will ensure new upgrades are processed on old installs.
-	 */
-	public function maybe_upgrade() {
-
-		$old_key     = $this->get_db()->prefix . 'bdb_series_db_version';
-		$old_version = get_option( $old_key );
-
-		if ( false !== $old_version ) {
-			update_option( $this->db_version_key, get_option( $old_key ) );
-
-			delete_option( $old_key );
-		}
-
-		return parent::maybe_upgrade();
-
-	}
-
-	/**
-	 * Upgrade to version 201910122
-	 *      - Rename `ID` to `id` & add `unsigned`
-	 *
-	 * @return bool
-	 */
-	protected function __201910122() {
-
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} CHANGE `ID` `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT" );
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910123
-	 *      - Add `unsigned` to `number_books`
-	 *
-	 * @return bool
-	 */
-	protected function __201910123() {
-
-		$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} MODIFY number_books bigint(20) UNSIGNED NOT NULL DEFAULT 0" );
-
-		return $this->is_success( $result );
-
-	}
-
-	/**
-	 * Upgrade to version 201910124
-	 *      - Add `date_created` column
-	 *      - Add `date_modified` column
-	 *
-	 * @return bool
-	 */
-	protected function __201910124() {
-
-		$result = $this->column_exists( 'date_created' );
-
-		if ( ! $result ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD COLUMN date_created datetime NOT NULL DEFAULT '0000-00-00 00:00:00'" );
-		}
-
-		$result = $this->column_exists( 'date_modified' );
-
-		if ( ! $result ) {
-			$result = $this->get_db()->query( "ALTER TABLE {$this->table_name} ADD COLUMN date_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00'" );
-		}
-
-		return $result;
-
-	}
-
-}
\ No newline at end of file
diff --git a/includes/deprecated/deprecated-functions.php b/includes/deprecated/deprecated-functions.php
new file mode 100644
index 00000000..e6a671cd
--- /dev/null
+++ b/includes/deprecated/deprecated-functions.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * deprecated-functions.php
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ * @since     1.3
+ */
+
+namespace Book_Database;
+
+use Book_Database\Shortcodes\BookGridShortcode;
+use Book_Database\Shortcodes\BookReviewsShortcode;
+use Book_Database\Shortcodes\BookShortcode;
+
+/**
+ * Book
+ *
+ * Display book information.
+ *
+ * @param  array  $atts  Shortcode attributes.
+ * @param  string  $content  Shortcode content.
+ *
+ * @return string
+ */
+function book_shortcode($atts, $content = '')
+{
+    _deprecated_function(__FUNCTION__, '1.3', BookShortcode::class);
+
+    return book_database(BookShortcode::class)->make($atts, $content);
+}
+
+/**
+ * Book reviews
+ *
+ * Displays a list of book reviews with filters allowing users to change the parameters.
+ *
+ * @deprecated 1.3
+ *
+ * @param array  $atts    Shortcode attributes.
+ * @param string $content Shortcode content.
+ *
+ * @return string
+ */
+function book_reviews_shortcode($atts, $content = '')
+{
+    _deprecated_function(__FUNCTION__, '1.3', BookReviewsShortcode::class);
+
+    return book_database(BookReviewsShortcode::class)->make($atts, $content);
+}
+
+/**
+ * Book grid
+ *
+ * Similar to `[book-reviews]` but filtering is done via shortcode attributes instead of
+ * a front-end form. It also focuses on books rather than reviews.
+ *
+ * @deprecated 1.3
+ *
+ * @param  array  $atts  Shortcode attributes.
+ * @param  string  $content  Shortcode content.
+ *
+ * @return string
+ */
+function book_grid_shortcode($atts, $content = '')
+{
+    _deprecated_function(__FUNCTION__, '1.3', BookGridShortcode::class);
+
+    return book_database(BookGridShortcode::class)->make($atts, $content);
+}
+
diff --git a/includes/editions/class-edition.php b/includes/editions/class-edition.php
deleted file mode 100644
index 82b8334c..00000000
--- a/includes/editions/class-edition.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * Edition Object
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Edition
- * @package Book_Database
- */
-class Edition extends Base_Object {
-
-	protected $book_id = 0;
-
-	protected $isbn = '';
-
-	protected $format = '';
-
-	protected $date_acquired = null;
-
-	protected $source_id = null;
-
-	protected $signed = null;
-
-	/**
-	 * Get the ID of the book
-	 *
-	 * @return int
-	 */
-	public function get_book_id() {
-		return absint( $this->book_id );
-	}
-
-	/**
-	 * Get the ISBN
-	 *
-	 * @return string
-	 */
-	public function get_isbn() {
-		return $this->isbn;
-	}
-
-	/**
-	 * Get the format (ebook, hardback, etc.)
-	 *
-	 * @return string
-	 */
-	public function get_format() {
-		return $this->format;
-	}
-
-	/**
-	 * Get the date the book was acquired
-	 *
-	 * @param bool   $formatted Whether or not to format the date for display.
-	 * @param string $format    Format to display the formatted date in. Default to site format.
-	 *
-	 * @return string|null
-	 */
-	public function get_date_acquired( $formatted = false, $format = '' ) {
-		return ( ! empty( $this->date_acquired ) && $formatted ) ? format_date( $this->date_acquired, $format ) : $this->date_acquired;
-	}
-
-	/**
-	 * Get the ID of the source term
-	 *
-	 * @return int|null
-	 */
-	public function get_source_id() {
-		return ! empty( $this->source_id ) ? absint( $this->source_id ) : null;
-	}
-
-	/**
-	 * Whether or not the book is signed
-	 *
-	 * @return bool
-	 */
-	public function is_signed() {
-		return ! empty( $this->signed );
-	}
-
-	/**
-	 * Export properties
-	 *
-	 * @return array
-	 */
-	public function export_vars() {
-		$vars                = parent::export_vars();
-		$vars['format_name'] = get_book_formats()[ $this->get_format() ] ?? '';
-
-		if ( $this->get_source_id() ) {
-			$source = get_book_term( $this->get_source_id() );
-
-			if ( $source instanceof Book_Term ) {
-				$vars['source_name'] = $source->get_name();
-			}
-		}
-
-		return $vars;
-	}
-
-}
\ No newline at end of file
diff --git a/includes/editions/edition-functions.php b/includes/editions/edition-functions.php
index 907b7ce8..acf019b8 100644
--- a/includes/editions/edition-functions.php
+++ b/includes/editions/edition-functions.php
@@ -9,6 +9,10 @@
 
 namespace Book_Database;
 
+use Book_Database\Database\Editions\EditionsQuery;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Models\Edition;
+
 /**
  * Get a single edition by its ID
  *
@@ -18,7 +22,7 @@
  */
 function get_edition( $edition_id ) {
 
-	$query = new Editions_Query();
+	$query = new EditionsQuery();
 
 	return $query->get_item( $edition_id );
 
@@ -34,7 +38,7 @@ function get_edition( $edition_id ) {
  */
 function get_edition_by( $column_name, $column_value ) {
 
-	$query = new Editions_Query();
+	$query = new EditionsQuery();
 
 	return $query->get_item_by( $column_name, $column_value );
 
@@ -82,7 +86,7 @@ function get_editions( $args = array() ) {
 		'number' => 20
 	) );
 
-	$query = new Editions_Query();
+	$query = new EditionsQuery();
 
 	return $query->query( $args );
 
@@ -103,7 +107,7 @@ function count_editions( $args = array() ) {
 		'count' => true
 	) );
 
-	$query = new Editions_Query( $args );
+	$query = new EditionsQuery( $args );
 
 	return absint( $query->found_items );
 
@@ -140,7 +144,7 @@ function add_edition( $args = array() ) {
 		throw new Exception( 'missing_required_parameter', __( 'A book ID is required.', 'book-database' ), 400 );
 	}
 
-	$query      = new Editions_Query();
+	$query      = new EditionsQuery();
 	$edition_id = $query->add_item( $args );
 
 	if ( empty( $edition_id ) ) {
@@ -162,7 +166,7 @@ function add_edition( $args = array() ) {
  */
 function update_edition( $edition_id, $args = array() ) {
 
-	$query   = new Editions_Query();
+	$query   = new EditionsQuery();
 	$updated = $query->update_item( $edition_id, $args );
 
 	if ( ! $updated ) {
@@ -183,7 +187,7 @@ function update_edition( $edition_id, $args = array() ) {
  */
 function delete_edition( $edition_id ) {
 
-	$query   = new Editions_Query();
+	$query   = new EditionsQuery();
 	$deleted = $query->delete_item( $edition_id );
 
 	if ( ! $deleted ) {
@@ -229,4 +233,4 @@ function get_book_formats() {
 	 */
 	return apply_filters( 'book-database/book/formats', $formats );
 
-}
\ No newline at end of file
+}
diff --git a/includes/misc-functions.php b/includes/misc-functions.php
index 7f9dc29f..0e681f27 100644
--- a/includes/misc-functions.php
+++ b/includes/misc-functions.php
@@ -3,52 +3,58 @@
  * Misc. Functions
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
 namespace Book_Database;
 
+use Book_Database\Models\Author;
+use Book_Database\Models\BookTerm;
+use Book_Database\Models\Series;
+use Book_Database\ValueObjects\Rating;
+
 /**
  * Get an array of all settings
  *
  * @return array
  */
-function bdb_get_settings() {
-	return get_option( 'bdb_settings', array() );
+function bdb_get_settings(): array
+{
+    return (array) get_option('bdb_settings', array());
 }
 
 /**
  * Get an option value
  *
- * @param string $key
- * @param bool   $default
+ * @param  string  $key
+ * @param  mixed  $default
  *
  * @return mixed
  */
-function bdb_get_option( $key, $default = false ) {
-
-	$settings = bdb_get_settings();
-
-	return isset( $settings[ $key ] ) ? $settings[ $key ] : $default;
+function bdb_get_option($key, $default = false)
+{
+    $settings = bdb_get_settings();
 
+    return $settings[$key] ?? $default;
 }
 
 /**
  * Update an option
  *
- * @param string $key
- * @param mixed  $value
+ * @param  string  $key
+ * @param  mixed  $value
  *
  * @return bool
  */
-function bdb_update_option( $key, $value ) {
+function bdb_update_option($key, $value)
+{
 
-	$settings = bdb_get_settings();
+    $settings = bdb_get_settings();
 
-	$settings[ $key ] = $value;
+    $settings[$key] = $value;
 
-	return update_option( 'bdb_settings', $settings );
+    return update_option('bdb_settings', $settings);
 
 }
 
@@ -57,18 +63,17 @@ function bdb_update_option( $key, $value ) {
  *
  * This converts a GMT date to local site time and formats it.
  *
- * @param string $date   Date string to format.
- * @param string $format Date format. Default is the site's `date_format`.
+ * @param  string  $date  Date string to format.
+ * @param  string  $format  Date format. Default is the site's `date_format`.
  *
  * @return string
  */
-function format_date( $date, $format = '' ) {
-
-	$format     = ! empty( $format ) ? $format : get_option( 'date_format' );
-	$local_date = get_date_from_gmt( $date, 'Y-m-d H:i:s' );
-
-	return date( $format, strtotime( $local_date ) );
+function format_date(string $date, string $format = ''): string
+{
+    $format     = ! empty($format) ? $format : get_option('date_format');
+    $local_date = get_date_from_gmt($date, 'Y-m-d H:i:s');
 
+    return date($format, strtotime($local_date));
 }
 
 /**
@@ -102,58 +107,57 @@ function getParsableDateFormat(): string
  *
  * @see wp_unique_post_slug()
  *
- * @param string $slug     Desired slug.
- * @param string $taxonomy Accepts any taxonomy slug, `author`, `series`, or `book_taxonomy`.
+ * @param  string  $slug  Desired slug.
+ * @param  string  $taxonomy  Accepts any taxonomy slug, `author`, `series`, or `book_taxonomy`.
  *
  * @return string A unique slug.
  */
-function unique_book_slug( $slug, $taxonomy = 'author' ) {
-
-	// Check if this slug already exists.
-	if ( 'series' === $taxonomy ) {
-		$terms = get_book_series_by( 'slug', $slug );
-	} elseif ( 'book_taxonomy' === $taxonomy ) {
-		$terms = get_book_taxonomy_by( 'slug', $slug );
-	} elseif ( 'author' == $taxonomy ) {
-		$terms = get_book_author_by( 'slug', $slug );
-	} else {
-		$terms = count_book_terms( array(
-			'taxonomy' => $taxonomy,
-			'slug'     => $slug
-		) );
-	}
-
-	$new_slug = $slug;
-
-	if ( $terms ) {
-		$suffix = 2;
-
-		do {
-
-			$alt_slug = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . '-' . $suffix;
-
-			if ( 'series' === $taxonomy ) {
-				$terms = get_book_series_by( 'slug', $alt_slug );
-			} elseif ( 'book_taxonomy' === $taxonomy ) {
-				$terms = get_book_taxonomy_by( 'slug', $alt_slug );
-			} elseif ( 'author' === $taxonomy ) {
-				$terms = get_book_author_by( 'slug', $alt_slug );
-			} else {
-				$terms = count_book_terms( array(
-					'taxonomy' => $taxonomy,
-					'slug'     => $alt_slug
-				) );
-			}
-
-			$suffix ++;
-
-		} while ( $terms );
-
-		$new_slug = $alt_slug;
-	}
-
-	return apply_filters( 'book-database/unique-slug', $new_slug, $slug, $taxonomy );
-
+function unique_book_slug(string $slug, string $taxonomy = 'author'): string
+{
+    // Check if this slug already exists.
+    if ('series' === $taxonomy) {
+        $terms = get_book_series_by('slug', $slug);
+    } elseif ('book_taxonomy' === $taxonomy) {
+        $terms = get_book_taxonomy_by('slug', $slug);
+    } elseif ('author' == $taxonomy) {
+        $terms = get_book_author_by('slug', $slug);
+    } else {
+        $terms = count_book_terms(array(
+            'taxonomy' => $taxonomy,
+            'slug'     => $slug
+        ));
+    }
+
+    $new_slug = $slug;
+
+    if ($terms) {
+        $suffix = 2;
+
+        do {
+
+            $alt_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)).'-'.$suffix;
+
+            if ('series' === $taxonomy) {
+                $terms = get_book_series_by('slug', $alt_slug);
+            } elseif ('book_taxonomy' === $taxonomy) {
+                $terms = get_book_taxonomy_by('slug', $alt_slug);
+            } elseif ('author' === $taxonomy) {
+                $terms = get_book_author_by('slug', $alt_slug);
+            } else {
+                $terms = count_book_terms(array(
+                    'taxonomy' => $taxonomy,
+                    'slug'     => $alt_slug
+                ));
+            }
+
+            $suffix++;
+
+        } while ($terms);
+
+        $new_slug = $alt_slug;
+    }
+
+    return apply_filters('book-database/unique-slug', $new_slug, $slug, $taxonomy);
 }
 
 /**
@@ -164,54 +168,54 @@ function unique_book_slug( $slug, $taxonomy = 'author' ) {
  *
  * @return bool
  */
-function link_book_terms() {
-	return apply_filters( 'book-database/link-terms', true );
+function link_book_terms(): bool
+{
+    return (bool) apply_filters('book-database/link-terms', true);
 }
 
 /**
  * Get the term archive link
  *
- * @param Author|Book_Term|Series|Rating $term
+ * @param  Author|BookTerm|Series|Rating  $term
  *
- * @return bool
+ * @return string|false
  */
-function get_book_term_link( $term ) {
-
-	if ( ! is_object( $term ) ) {
-		return false;
-	}
-
-	$slug     = method_exists( $term, 'get_slug' ) ? $term->get_slug() : '';
-	$taxonomy = '';
-
-	if ( $term instanceof Author ) {
-		$taxonomy = 'author';
-	} elseif ( $term instanceof Book_Term ) {
-		$taxonomy = $term->get_taxonomy();
-	} elseif ( $term instanceof Series ) {
-		$taxonomy = 'series';
-	} elseif ( $term instanceof Rating ) {
-		$taxonomy = 'rating';
-		$slug     = $term->get_rating();
-	}
-
-	if ( empty( $taxonomy ) || empty( $slug ) ) {
-		return false;
-	}
-
-	$base_url  = untrailingslashit( get_reviews_page_url() );
-	$final_url = sprintf( '%1$s/%2$s/%3$s/', $base_url, urlencode( $taxonomy ), urlencode( $slug ) );
-
-	/**
-	 * Filters the term archive URL.
-	 *
-	 * @param string                         $final_url Final archive URL.
-	 * @param string                         $slug      Term slug.
-	 * @param string                         $taxonomy  Term taxonomy / type.
-	 * @param Author|Book_Term|Series|Rating $term      Term object.
-	 */
-	return apply_filters( 'book-database/term-archive-link', $final_url, $slug, $taxonomy, $term );
-
+function get_book_term_link($term)
+{
+    if (! is_object($term)) {
+        return false;
+    }
+
+    $slug     = method_exists($term, 'get_slug') ? $term->get_slug() : '';
+    $taxonomy = '';
+
+    if ($term instanceof Author) {
+        $taxonomy = 'author';
+    } elseif ($term instanceof BookTerm) {
+        $taxonomy = $term->get_taxonomy();
+    } elseif ($term instanceof Series) {
+        $taxonomy = 'series';
+    } elseif ($term instanceof Rating) {
+        $taxonomy = 'rating';
+        $slug     = $term->get_rating();
+    }
+
+    if (empty($taxonomy) || empty($slug)) {
+        return false;
+    }
+
+    $base_url  = untrailingslashit(get_reviews_page_url());
+    $final_url = sprintf('%1$s/%2$s/%3$s/', $base_url, urlencode($taxonomy), urlencode($slug));
+
+    /**
+     * Filters the term archive URL.
+     *
+     * @param  string  $final_url  Final archive URL.
+     * @param  string  $slug  Term slug.
+     * @param  string  $taxonomy  Term taxonomy / type.
+     * @param  Author|BookTerm|Series|Rating  $term  Term object.
+     */
+    return apply_filters('book-database/term-archive-link', $final_url, $slug, $taxonomy, $term);
 }
 
 /**
@@ -219,10 +223,11 @@ function get_book_term_link( $term ) {
  *
  * @return \DateTimeZone
  */
-function get_site_timezone() {
-	if ( function_exists( 'wp_timezone' ) ) {
-		return wp_timezone();
-	} else {
-		return new \DateTimeZone( get_option( 'timezone_string' ) );
-	}
+function get_site_timezone(): \DateTimeZone
+{
+    if (function_exists('wp_timezone')) {
+        return wp_timezone();
+    } else {
+        return new \DateTimeZone(get_option('timezone_string'));
+    }
 }
diff --git a/includes/ratings/class-rating.php b/includes/ratings/class-rating.php
deleted file mode 100644
index 729bb1db..00000000
--- a/includes/ratings/class-rating.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-/**
- * Rating Object
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Rating
- * @package Book_Database
- */
-class Rating {
-
-	/**
-	 * Raw rating value from the database
-	 *
-	 * @var null|float|int
-	 */
-	protected $rating;
-
-	/**
-	 * Highest possible rating
-	 *
-	 * @var float|int
-	 */
-	protected $max;
-
-	/**
-	 * Available ratings
-	 *
-	 * @var array
-	 */
-	protected $available_ratings;
-
-	/**
-	 * Rating constructor.
-	 *
-	 * @param null|float|int $rating
-	 */
-	public function __construct( $rating = null ) {
-		$this->set_rating( $rating );
-		$this->available_ratings = get_available_ratings();
-		$this->max               = max( array_keys( $this->available_ratings ) );
-	}
-
-	/**
-	 * Set the rating
-	 *
-	 * @param null|float|int $rating Rating value to set.
-	 */
-	public function set_rating( $rating ) {
-		if ( is_null( $rating ) ) {
-			$this->rating = null;
-		} elseif ( is_numeric( $rating ) ) {
-			$this->rating = $rating + 0;
-		} else {
-			$this->rating = $rating;
-		}
-	}
-
-	/**
-	 * Get the raw rating
-	 *
-	 * @return float|int|null
-	 */
-	public function get_rating() {
-		return $this->rating;
-	}
-
-	/**
-	 * Get the highest possible rating
-	 *
-	 * @return float|int
-	 */
-	public function get_max_rating() {
-		return $this->max;
-	}
-
-	/**
-	 * Round the rating to the nearest half
-	 *
-	 * @return float|int|null
-	 */
-	public function round_rating() {
-
-		$rating = $this->rating;
-
-		if ( is_null( $rating ) || ! is_numeric( $rating ) ) {
-			return null;
-		}
-
-		if ( ! array_key_exists( (string) $rating, $this->available_ratings ) ) {
-			$rating = round( $this->rating * 2 ) / 2;
-		}
-
-		return $rating;
-
-	}
-
-	/**
-	 * Format the rating
-	 *
-	 * @param string $format
-	 *
-	 * @return float|int|null
-	 */
-	public function format( $format = 'text' ) {
-
-		$rating = $this->round_rating();
-
-		if ( is_null( $format ) || ! is_numeric( $rating ) ) {
-			return $rating;
-		} elseif ( method_exists( $this, 'format_' . $format ) ) {
-			return call_user_func( array( $this, 'format_' . $format ) );
-		} else {
-			return $rating;
-		}
-
-	}
-
-	/**
-	 * Format as text (with "Star(s)" appended)
-	 *
-	 * @return string
-	 */
-	public function format_text() {
-
-		if ( null === $this->rating ) {
-			$text = '&ndash;';
-		} elseif ( ! is_numeric( $this->rating ) ) {
-			return $this->rating;
-		} else {
-			$text = $this->rating * 1;
-
-			if ( array_key_exists( (string) $text, $this->available_ratings ) ) {
-				$text = $this->available_ratings[ (string) $text ];
-			} else {
-				$text = sprintf( _n( '%s Star', '%s Stars', $text, 'book-database' ), $text );
-			}
-		}
-
-		/**
-		 * Filters the text display.
-		 *
-		 * @param string         $text
-		 * @param null|float|int $rating
-		 * @param Rating         $this
-		 */
-		return apply_filters( 'book-database/rating/format/text', $text, $this->rating, $this );
-
-	}
-
-	/**
-	 * Format with Font Awesome stars
-	 *
-	 * @return string
-	 */
-	public function format_font_awesome() {
-
-		if ( ! is_numeric( $this->rating ) ) {
-			return $this->format_text();
-		}
-
-		$font_awesome_rating = $this->repeat( '<i class="fas fa-star"></i>', '<i class="fas fa-star-half-alt"></i>', '<i class="far fa-star"></i>' );
-
-		/**
-		 * Filters the Font Awesome rating display.
-		 *
-		 * @param string         $font_awesome_rating
-		 * @param null|float|int $rating
-		 * @param Rating         $this
-		 */
-		return apply_filters( 'book-database/rating/format/font_awesome', $font_awesome_rating, $this->rating, $this );
-
-	}
-
-	/**
-	 * Format with HTML stars
-	 *
-	 * @return string
-	 */
-	public function format_html_stars() {
-
-		if ( ! is_numeric( $this->rating ) ) {
-			return $this->format_text();
-		}
-
-		$html_stars = $this->repeat( '&starf;', '&half;', '' );
-
-		/**
-		 * Filters the HTML stars display.
-		 *
-		 * @param string         $html_stars
-		 * @param null|float|int $rating
-		 * @param Rating         $this
-		 */
-		return apply_filters( 'book-database/rating/format/html_stars', $html_stars, $this->rating, $this );
-
-	}
-
-	/**
-	 * Format as HTML class name
-	 *
-	 * @return string
-	 */
-	public function format_html_class() {
-
-		$class  = '';
-		$rating = $this->round_rating();
-
-		switch ( $rating ) {
-			case '5' :
-				$class = 'five-stars';
-				break;
-			case '4.5' :
-				$class = 'four-half-stars';
-				break;
-			case '4' :
-				$class = 'four-stars';
-				break;
-			case '3.5' :
-				$class = 'three-half-stars';
-				break;
-			case '3' :
-				$class = 'three-stars';
-				break;
-			case '2.5' :
-				$class = 'two-half-stars';
-				break;
-			case '2' :
-				$class = 'two-stars';
-				break;
-			case '1.5' :
-				$class = 'one-half-stars';
-				break;
-			case '1' :
-				$class = 'one-star';
-				break;
-			case '0.5' :
-				$class = 'half-star';
-				break;
-			case '0' :
-				$class = 'zero-stars';
-				break;
-		}
-
-		/**
-		 * Filters the HTML class display
-		 *
-		 * @param string         $class
-		 * @param null|float|int $rating
-		 * @param Rating         $this
-		 */
-		return apply_filters( 'book-database/rating/format/html_class', $class, $this->rating, $this );
-
-	}
-
-	/**
-	 * Repeat text/HTML for the number of stars
-	 *
-	 * @param string $full_star  Text/HTML to use for full stars.
-	 * @param string $half_star  Text/HTML to use for half stars.
-	 * @param string $empty_star Text/HTML to use for empty stars.
-	 *
-	 * @return string
-	 */
-	public function repeat( $full_star, $half_star = '', $empty_star = '' ) {
-
-		$rating      = $this->round_rating();
-		$full_stars  = floor( $rating );
-		$half_stars  = ceil( $rating - $full_stars );
-		$empty_stars = $this->max - $full_stars - $half_stars;
-
-		$output = str_repeat( $full_star, $full_stars );
-		$output .= str_repeat( $half_star, $half_stars );
-		$output .= str_repeat( $empty_star, $empty_stars );
-
-		return $output;
-
-	}
-
-}
\ No newline at end of file
diff --git a/includes/reading-logs/class-reading-log.php b/includes/reading-logs/class-reading-log.php
deleted file mode 100644
index 2d1aaa01..00000000
--- a/includes/reading-logs/class-reading-log.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-/**
- * Reading Log Object
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Reading_Log
- *
- * @package Book_Database
- */
-class Reading_Log extends Base_Object {
-
-	protected $book_id = 0;
-
-	protected $edition_id = null;
-
-	protected $user_id = 0;
-
-	protected $date_started = '';
-
-	protected $date_finished = '';
-
-	protected $percentage_complete = 0;
-
-	protected $rating = null;
-
-	/**
-	 * Get the ID of the associated book
-	 *
-	 * @return int
-	 */
-	public function get_book_id() {
-		return absint( $this->book_id );
-	}
-
-	/**
-	 * Get the ID of the associated edition
-	 *
-	 * @return int|null
-	 */
-	public function get_edition_id() {
-		return ! empty( $this->edition_id ) ? absint( $this->edition_id ) : null;
-	}
-
-	/**
-	 * Get the ID of the user who made this entry
-	 *
-	 * @return int
-	 */
-	public function get_user_id() {
-		return absint( $this->user_id );
-	}
-
-	/**
-	 * Get the date the user started reading
-	 *
-	 * @param bool   $formatted Whether or not to format the result for display.
-	 * @param string $format    Format to display in. Defaults to site format.
-	 *
-	 * @return string
-	 */
-	public function get_date_started( $formatted = false, $format = '' ) {
-		return ( ! empty( $this->date_started ) && $formatted ) ? format_date( $this->date_started, $format ) : $this->date_started;
-	}
-
-	/**
-	 * Get the date the user finished reading
-	 *
-	 * @param bool   $formatted Whether or not to format the result for display.
-	 * @param string $format    Format to display in. Defaults to site format.
-	 *
-	 * @return string
-	 */
-	public function get_date_finished( $formatted = false, $format = '' ) {
-		return ( ! empty( $this->date_finished ) && $formatted ) ? format_date( $this->date_finished, $format ) : $this->date_finished;
-	}
-
-	/**
-	 * Get the percentage complete
-	 *
-	 * Note: This is the `percentage_complete` value multiplied by 100.
-	 *
-	 * @return float
-	 */
-	public function get_percentage_complete() {
-		$percentage = floatval( $this->percentage_complete );
-
-		if ( $percentage >= 1 ) {
-			$percentage = 1;
-		} elseif ( $percentage <= 0 ) {
-			$percentage = 0;
-		}
-
-		return round( $percentage * 100, 2 );
-	}
-
-	/**
-	 * Whether or not the book has been fully read
-	 *
-	 * @return bool
-	 */
-	public function is_complete() {
-		return $this->get_percentage_complete() >= 100;
-	}
-
-	/**
-	 * A book is "DNF" (didn't finish) if there's a finished date but the percentage is less than 100%.
-	 *
-	 * @return bool
-	 */
-	public function is_dnf() {
-		return ! empty( $this->get_date_finished() ) && ! $this->is_complete();
-	}
-
-	/**
-	 * Get the rating
-	 *
-	 * @return float|null
-	 */
-	public function get_rating() {
-		return $this->rating;
-	}
-
-	/**
-	 * Export vars
-	 *
-	 * @return array
-	 */
-	public function export_vars() {
-
-		$vars = parent::export_vars();
-
-		$vars['is_complete'] = $this->is_complete();
-		$vars['is_dnf']      = $this->is_dnf();
-
-		// Get the edition.
-		$edition         = $this->get_edition_id() ? get_edition( $this->get_edition_id() ) : null;
-		$vars['edition'] = $edition instanceof Edition ? $edition->export_vars() : null;
-
-		// Get the review ID.
-		$review = get_review_by( 'reading_log_id', $this->get_id() );
-		if ( $review instanceof Review ) {
-			$vars['review_id'] = $review->get_id();
-		}
-
-		// Calculate the page number we're on.
-		$vars['page']      = 0;
-		$vars['max_pages'] = 0;
-		$book              = get_book( $this->get_book_id() );
-		if ( $book instanceof Book ) {
-			$percentage        = $this->get_percentage_complete() / 100;
-			$vars['page']      = round( $percentage * $book->get_pages() );
-			$vars['max_pages'] = $book->get_pages();
-		}
-
-		return $vars;
-
-	}
-
-}
\ No newline at end of file
diff --git a/includes/reading-logs/reading-log-functions.php b/includes/reading-logs/reading-log-functions.php
index 112b0d44..dc6d7a50 100644
--- a/includes/reading-logs/reading-log-functions.php
+++ b/includes/reading-logs/reading-log-functions.php
@@ -9,16 +9,20 @@
 
 namespace Book_Database;
 
+use Book_Database\Database\ReadingLogs\ReadingLogsQuery;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Models\ReadingLog;
+
 /**
  * Get a single reading log entry by its ID
  *
  * @param int $log_id
  *
- * @return Reading_Log|false
+ * @return ReadingLog|false
  */
 function get_reading_log( $log_id ) {
 
-	$query = new Reading_Logs_Query();
+	$query = new ReadingLogsQuery();
 
 	return $query->get_item( $log_id );
 
@@ -30,11 +34,11 @@ function get_reading_log( $log_id ) {
  * @param string $column_name
  * @param mixed  $column_value
  *
- * @return Reading_Log|false
+ * @return ReadingLog|false
  */
 function get_reading_log_by( $column_name, $column_value ) {
 
-	$query = new Reading_Logs_Query();
+	$query = new ReadingLogsQuery();
 
 	return $query->get_item_by( $column_name, $column_value );
 
@@ -76,7 +80,7 @@ function get_reading_log_by( $column_name, $column_value ) {
  * @type bool         $update_cache        Whether to prime the cache for found items. Default false.
  * }
  *
- * @return Reading_Log[] Array of Reading_Log objects.
+ * @return ReadingLog[] Array of Reading_Log objects.
  */
 function get_reading_logs( $args = array() ) {
 
@@ -84,7 +88,7 @@ function get_reading_logs( $args = array() ) {
 		'number' => 20
 	) );
 
-	$query = new Reading_Logs_Query();
+	$query = new ReadingLogsQuery();
 
 	return $query->query( $args );
 
@@ -105,7 +109,7 @@ function count_reading_logs( $args = array() ) {
 		'count' => true
 	) );
 
-	$query = new Reading_Logs_Query( $args );
+	$query = new ReadingLogsQuery( $args );
 
 	return absint( $query->found_items );
 
@@ -148,7 +152,7 @@ function add_reading_log( $args = array() ) {
 		throw new Exception( 'missing_required_parameter', __( 'A user ID is required.', 'book-database' ), 400 );
 	}
 
-	$query  = new Reading_Logs_Query();
+	$query  = new ReadingLogsQuery();
 	$log_id = $query->add_item( $args );
 
 	if ( empty( $log_id ) ) {
@@ -170,7 +174,7 @@ function add_reading_log( $args = array() ) {
  */
 function update_reading_log( $log_id, $args = array() ) {
 
-	$query   = new Reading_Logs_Query();
+	$query   = new ReadingLogsQuery();
 	$updated = $query->update_item( $log_id, $args );
 
 	if ( ! $updated ) {
@@ -191,7 +195,7 @@ function update_reading_log( $log_id, $args = array() ) {
  */
 function delete_reading_log( $log_id ) {
 
-	$query   = new Reading_Logs_Query();
+	$query   = new ReadingLogsQuery();
 	$deleted = $query->delete_item( $log_id );
 
 	if ( ! $deleted ) {
@@ -218,4 +222,4 @@ function delete_reading_log( $log_id ) {
 
 	return true;
 
-}
\ No newline at end of file
+}
diff --git a/includes/rest-api/class-rest-api.php b/includes/rest-api/class-rest-api.php
deleted file mode 100644
index 9dc8f908..00000000
--- a/includes/rest-api/class-rest-api.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * REST API Setup
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class REST_API
- * @package Book_Database
- */
-class REST_API {
-
-	/**
-	 * REST_API constructor.
-	 */
-	public function __construct() {
-		add_action( 'rest_api_init', array( $this, 'register_routes' ), 20 );
-	}
-
-	/**
-	 * Register routes
-	 */
-	public function register_routes() {
-		$controllers = array(
-			'\Book_Database\REST_API\v1\Analytics',
-			'\Book_Database\REST_API\v1\Author',
-			'\Book_Database\REST_API\v1\Book',
-			'\Book_Database\REST_API\v1\Book_Link',
-			'\Book_Database\REST_API\v1\Book_Term',
-			'\Book_Database\REST_API\v1\Edition',
-			'\Book_Database\REST_API\v1\Reading_Log',
-			'\Book_Database\REST_API\v1\Retailer',
-			'\Book_Database\REST_API\v1\Review',
-			'\Book_Database\REST_API\v1\Series',
-			'\Book_Database\REST_API\v1\Taxonomy',
-			'\Book_Database\REST_API\v1\Utility',
-		);
-
-		foreach ( $controllers as $controller ) {
-			$controller = new $controller();
-
-			/**
-			 * @var REST_API\Controller $controller
-			 */
-
-			$controller->register_routes();
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/includes/retailers/class-retailer.php b/includes/retailers/class-retailer.php
deleted file mode 100644
index 6c700288..00000000
--- a/includes/retailers/class-retailer.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Retailer Object
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Retailer
- * @package Book_Database
- */
-class Retailer extends Base_Object {
-
-	/**
-	 * @var string Name of the retailer
-	 */
-	protected $name = '';
-
-	/**
-	 * @var string Template, for use in the book layout
-	 */
-	protected $template = '';
-
-	/**
-	 * Get the name of the retailer
-	 *
-	 * @return string
-	 */
-	public function get_name() {
-		return $this->name;
-	}
-
-	/**
-	 * Get the template
-	 *
-	 * @return string
-	 */
-	public function get_template() {
-		return $this->template;
-	}
-
-	/**
-	 * Build a link
-	 *
-	 * This injects the provided URL into the template, replacing the `[url]` placeholder.
-	 *
-	 * @param string $url
-	 *
-	 * @return string
-	 */
-	public function build_link( $url ) {
-
-		$template = $this->get_template();
-
-		if ( empty( $template ) ) {
-			$template = '<a href="[url]" target="_blank">' . esc_html( $this->get_name() ) . '</a>';
-		}
-
-		return str_replace( '[url]', esc_url( $url ), $template );
-
-	}
-
-}
\ No newline at end of file
diff --git a/includes/retailers/retailer-functions.php b/includes/retailers/retailer-functions.php
index 1d0af520..b5f9adc2 100644
--- a/includes/retailers/retailer-functions.php
+++ b/includes/retailers/retailer-functions.php
@@ -9,6 +9,10 @@
 
 namespace Book_Database;
 
+use Book_Database\Database\Retailers\RetailersQuery;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Models\Retailer;
+
 /**
  * Get a single retailer by its ID
  *
@@ -18,7 +22,7 @@
  */
 function get_retailer( $retailer_id ) {
 
-	$query = new Retailers_Query();
+	$query = new RetailersQuery();
 
 	return $query->get_item( $retailer_id );
 
@@ -34,7 +38,7 @@ function get_retailer( $retailer_id ) {
  */
 function get_retailer_by( $column_name, $column_value ) {
 
-	$query = new Retailers_Query();
+	$query = new RetailersQuery();
 
 	return $query->get_item_by( $column_name, $column_value );
 
@@ -74,7 +78,7 @@ function get_retailers( $args = array() ) {
 		'number' => 20
 	) );
 
-	$query = new Retailers_Query();
+	$query = new RetailersQuery();
 
 	return $query->query( $args );
 
@@ -95,7 +99,7 @@ function count_retailers( $args = array() ) {
 		'count' => true
 	) );
 
-	$query = new Retailers_Query( $args );
+	$query = new RetailersQuery( $args );
 
 	return absint( $query->found_items );
 
@@ -124,7 +128,7 @@ function add_retailer( $args = array() ) {
 		throw new Exception( 'missing_required_parameter', __( 'An author name is required.', 'book-database' ), 400 );
 	}
 
-	$query       = new Retailers_Query();
+	$query       = new RetailersQuery();
 	$retailer_id = $query->add_item( $args );
 
 	if ( empty( $retailer_id ) ) {
@@ -146,7 +150,7 @@ function add_retailer( $args = array() ) {
  */
 function update_retailer( $retailer_id, $args = array() ) {
 
-	$query   = new Retailers_Query();
+	$query   = new RetailersQuery();
 	$updated = $query->update_item( $retailer_id, $args );
 
 	if ( ! $updated ) {
@@ -169,7 +173,7 @@ function delete_retailer( $retailer_id ) {
 
 	global $wpdb;
 
-	$query   = new Retailers_Query();
+	$query   = new RetailersQuery();
 	$deleted = $query->delete_item( $retailer_id );
 
 	if ( ! $deleted ) {
@@ -183,4 +187,4 @@ function delete_retailer( $retailer_id ) {
 
 	return true;
 
-}
\ No newline at end of file
+}
diff --git a/includes/reviews/class-review.php b/includes/reviews/class-review.php
deleted file mode 100644
index d5f42f1d..00000000
--- a/includes/reviews/class-review.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/**
- * Review Object
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Review
- * @package Book_Database
- */
-class Review extends Base_Object {
-
-	/**
-	 * @var int ID of the associated book.
-	 */
-	protected $book_id = 0;
-
-	/**
-	 * @var int ID of the associated reading log.
-	 */
-	protected $reading_log_id = 0;
-
-	/**
-	 * @var int ID of the user who wrote the review.
-	 */
-	protected $user_id = 0;
-
-	/**
-	 * @var int|null ID of the associated blog post.
-	 */
-	protected $post_id = null;
-
-	/**
-	 * @var string External URL to the review.
-	 */
-	protected $url = '';
-
-	/**
-	 * @var string Review content.
-	 */
-	protected $review = '';
-
-	/**
-	 * @var string Date the review was written.
-	 */
-	protected $date_written = '';
-
-	/**
-	 * @var string|null Date the review was published.
-	 */
-	protected $date_published = null;
-
-	/**
-	 * Get the ID of the book
-	 *
-	 * @return int
-	 */
-	public function get_book_id() {
-		return absint( $this->book_id );
-	}
-
-	/**
-	 * Get the ID of the user who wrote the review
-	 *
-	 * @return int
-	 */
-	public function get_reading_log_id() {
-		return is_null( $this->reading_log_id ) ? null : absint( $this->reading_log_id );
-	}
-
-	/**
-	 * Get the ID of the user who wrote the review
-	 *
-	 * @return int
-	 */
-	public function get_user_id() {
-		return absint( $this->user_id );
-	}
-
-	/**
-	 * Get the ID of the corresponding post
-	 *
-	 * This is the post the review was published on. This will only be filled out if the
-	 * review was published as a blog post on this site.
-	 *
-	 * @return int|null
-	 */
-	public function get_post_id() {
-		return is_null( $this->post_id ) ? null : absint( $this->post_id );
-	}
-
-	/**
-	 * Get the URL of the review
-	 *
-	 * This will only be filled out if the review is external.
-	 *
-	 * @return string
-	 */
-	public function get_url() {
-		return $this->url;
-	}
-
-	/**
-	 * Whether or not this is an external review
-	 *
-	 * Will return true if `url` is filled out.
-	 *
-	 * @return bool
-	 */
-	public function is_external() {
-		return ! empty( $this->get_url() );
-	}
-
-	/**
-	 * Get the review text
-	 *
-	 * @return string
-	 */
-	public function get_review() {
-		return $this->review;
-	}
-
-	/**
-	 * Get the date the review was written
-	 *
-	 * @param bool   $formatted Whether or not to format the result for display.
-	 * @param string $format    Format to display in. Defaults to site format.
-	 *
-	 * @return string
-	 */
-	public function get_date_written( $formatted = false, $format = '' ) {
-		return ( ! empty( $this->date_written ) && $formatted ) ? format_date( $this->date_written, $format ) : $this->date_written;
-	}
-
-	/**
-	 * Get the date the review was (or will be) published
-	 *
-	 * @param bool   $formatted Whether or not to format the result for display.
-	 * @param string $format    Format to display in. Defaults to site format.
-	 *
-	 * @return string|null
-	 */
-	public function get_date_published( $formatted = false, $format = '' ) {
-		return ( ! empty( $this->date_published ) && $formatted ) ? format_date( $this->date_published, $format ) : $this->date_published;
-	}
-
-	/**
-	 * Get the review permalink
-	 *
-	 * Returns the URL to the external review if provided, otherwise the URL to the post where
-	 * the review is located. Returns false if all else fails.
-	 *
-	 * @param bool $use_id      Whether or not to build the URL with the post ID (ugly permalinks).
-	 * @param bool $id_appended Whether or not to includle a "skip-to" the book ID.
-	 *
-	 * @return string|false
-	 */
-	public function get_permalink( $use_id = true, $id_appended = true ) {
-
-		$url = false;
-
-		if ( $this->is_external() ) {
-			$url = $this->get_url();
-		} elseif ( $this->get_post_id() && $use_id ) {
-			$url = add_query_arg( array( 'p' => urlencode( $this->get_post_id() ) ), home_url( '/' ) );
-		} elseif ( $this->get_post_id() ) {
-			$url = get_permalink( $this->get_post_id() );
-		}
-
-		if ( $id_appended && ! empty( $url ) && ! $this->is_external() ) {
-			$url .= '#book-' . urlencode( $this->get_book_id() );
-		}
-
-		/**
-		 * Filters the review permalink.
-		 *
-		 * @param string|false $url         URL to the review.
-		 * @param bool         $use_id      Whether or not to build the URL with the post ID (ugly permalinks).
-		 * @param bool         $id_appended Whether or not to includle a "skip-to" the book ID.
-		 * @param Review       $this        Review object.
-		 */
-		return apply_filters( 'book-database/review/get/permalink', $url, $use_id, $id_appended, $this );
-
-	}
-
-	/**
-	 * Whether or not the review has been published
-	 *
-	 * Returns `true` if the review is external, or if the review published date is in the past.
-	 * Returns `false` f the review is associated with a post and that post is not "published".
-	 *
-	 * @return bool
-	 */
-	public function is_published() {
-
-		if ( $this->is_external() ) {
-			return true;
-		}
-
-		if ( $this->get_post_id() ) {
-			$post = get_post( $this->get_post_id() );
-
-			if ( $post instanceof \WP_Post && 'publish' !== $post->post_status ) {
-				return false;
-			}
-		}
-
-		return ( $this->get_date_published( true, 'U' ) <= current_time( 'timestamp' ) );
-
-	}
-
-}
\ No newline at end of file
diff --git a/includes/reviews/review-actions.php b/includes/reviews/review-actions.php
index d669acf5..1b5e9808 100644
--- a/includes/reviews/review-actions.php
+++ b/includes/reviews/review-actions.php
@@ -9,6 +9,8 @@
 
 namespace Book_Database;
 
+use Book_Database\Exceptions\Exception;
+
 /**
  * When a post is published or scheduled, sync associated reviews with the post's publication date.
  *
@@ -56,4 +58,4 @@ function sync_review_publish_date( $new_status, $old_status, $post ) {
 
 }
 
-add_action( 'transition_post_status', __NAMESPACE__ . '\sync_review_publish_date', 10, 3 );
\ No newline at end of file
+add_action( 'transition_post_status', __NAMESPACE__ . '\sync_review_publish_date', 10, 3 );
diff --git a/includes/reviews/review-functions.php b/includes/reviews/review-functions.php
index d6f188e9..8580703b 100644
--- a/includes/reviews/review-functions.php
+++ b/includes/reviews/review-functions.php
@@ -3,41 +3,47 @@
  * Review Functions
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
 namespace Book_Database;
 
+use Book_Database\Database\Reviews\ReviewsQuery;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Models\Review;
+
 /**
  * Get a single review by its ID
  *
- * @param int $review_id
+ * @param  int  $review_id
  *
  * @return Review|false
  */
-function get_review( $review_id ) {
-
-	$query = new Reviews_Query();
-
-	return $query->get_item( $review_id );
-
+function get_review($review_id)
+{
+    try {
+        return Review::find($review_id);
+    } catch (\Exception $e) {
+        return false;
+    }
 }
 
 /**
  * Get a single review by a column name/value combo
  *
- * @param string $column_name
- * @param mixed  $column_value
+ * @param  string  $column_name
+ * @param  mixed  $column_value
  *
  * @return Review|false
  */
-function get_review_by( $column_name, $column_value ) {
-
-	$query = new Reviews_Query();
-
-	return $query->get_item_by( $column_name, $column_value );
-
+function get_review_by(string $column_name, $column_value)
+{
+    try {
+        return Review::findBy($column_name, $column_value);
+    } catch (\Exception $e) {
+        return false;
+    }
 }
 
 /**
@@ -60,14 +66,15 @@ function get_review_by( $column_name, $column_value ) {
  * @type bool   $count                      Whether or not to only return a count. Default false.
  * }
  *
- * @return object[] Array of database objects.
+ * @return Review[] Array of database objects.
  */
-function get_reviews( $args = array() ) {
-
-	$query = new Reviews_Query();
-
-	return $query->get_reviews( $args );
-
+function get_reviews(array $args = []): array
+{
+    try {
+        return Review::query($args);
+    } catch (\Exception $e) {
+        return [];
+    }
 }
 
 /**
@@ -79,16 +86,13 @@ function get_reviews( $args = array() ) {
  *
  * @return int
  */
-function count_reviews( $args = array() ) {
-
-	$args = wp_parse_args( $args, array(
-		'count' => true
-	) );
-
-	$query = new Reviews_Query( $args );
-
-	return absint( $query->found_items );
-
+function count_reviews(array $args = []): int
+{
+    try {
+        return Review::count($args);
+    } catch (\Exception $e) {
+        return 0;
+    }
 }
 
 /**
@@ -108,32 +112,9 @@ function count_reviews( $args = array() ) {
  * @return int ID of the newly created review.
  * @throws Exception
  */
-function add_review( $args = array() ) {
-
-	$args = wp_parse_args( $args, array(
-		'book_id'        => 0,
-		'reading_log_id' => null,
-		'user_id'        => get_current_user_id(),
-		'post_id'        => null,
-		'url'            => '',
-		'review'         => '',
-		'date_written'   => current_time( 'mysql', true ),
-		'date_published' => null
-	) );
-
-	if ( empty( $args['book_id'] ) ) {
-		throw new Exception( 'missing_parameter', __( 'Book ID is required.', 'book-database' ), 400 );
-	}
-
-	$query     = new Reviews_Query();
-	$review_id = $query->add_item( $args );
-
-	if ( empty( $review_id ) ) {
-		throw new Exception( 'database_error', __( 'Failed to insert new review into the database.', 'book-database' ), 500 );
-	}
-
-	return absint( $review_id );
-
+function add_review(array $args = []): int
+{
+    return Review::create($args);
 }
 
 /**
@@ -145,63 +126,42 @@ function add_review( $args = array() ) {
  * @return bool
  * @throws Exception
  */
-function update_review( $review_id, $args = array() ) {
-
-	$query   = new Reviews_Query();
-	$updated = $query->update_item( $review_id, $args );
-
-	if ( ! $updated ) {
-		throw new Exception( 'database_error', __( 'Failed to update the review.', 'book-database' ), 500 );
-	}
-
-	return true;
-
+function update_review($review_id, array $args = []): bool
+{
+    return Review::update($review_id, $args);
 }
 
 /**
  * Delete a review
  *
- * @param int $review_id ID of the review to delete.
+ * @param  int  $review_id  ID of the review to delete.
  *
  * @return bool
  * @throws Exception
  */
-function delete_review( $review_id ) {
-
-	$query   = new Reviews_Query();
-	$deleted = $query->delete_item( $review_id );
-
-	if ( ! $deleted ) {
-		throw new Exception( 'database_error', __( 'Failed to delete the review.', 'book-database' ), 500 );
-	}
-
-	// Delete all review meta.
-	global $wpdb;
-	$tbl_meta = book_database()->get_table( 'review_meta' )->get_table_name();
-	$query    = $wpdb->prepare( "DELETE FROM {$tbl_meta} WHERE bdb_review_id = %d", $review_id );
-	$wpdb->query( $query );
-
-	return true;
+function delete_review($review_id): bool
+{
+    Review::delete($review_id);
 
+    return true;
 }
 
 /**
  * Get the reviews admin page URL.
  *
- * @param array $args Query args to append to the URL.
+ * @param  array  $args  Query args to append to the URL.
  *
  * @return string
  */
-function get_reviews_admin_page_url( $args = array() ) {
+function get_reviews_admin_page_url(array $args = []): string
+{
+    $sanitized_args = array();
 
-	$sanitized_args = array();
-
-	foreach ( $args as $key => $value ) {
-		$sanitized_args[ sanitize_key( $key ) ] = urlencode( $value );
-	}
-
-	return add_query_arg( $sanitized_args, admin_url( 'admin.php?page=bdb-reviews' ) );
+    foreach ($args as $key => $value) {
+        $sanitized_args[sanitize_key($key)] = urlencode($value);
+    }
 
+    return add_query_arg($sanitized_args, admin_url('admin.php?page=bdb-reviews'));
 }
 
 /**
@@ -209,37 +169,32 @@ function get_reviews_admin_page_url( $args = array() ) {
  *
  * @return array
  */
-function get_reviewer_user_ids() {
-
-	global $wpdb;
-
-	$review_table = book_database()->get_table( 'reviews' )->get_table_name();
-
-	$results = $wpdb->get_col( "SELECT DISTINCT user_id FROM {$review_table}" );
+function get_reviewer_user_ids(): array
+{
+    global $wpdb;
 
-	return $results;
+    $review_table = book_database()->get_table('reviews')->get_table_name();
 
+    return $wpdb->get_col("SELECT DISTINCT user_id FROM {$review_table}");
 }
 
 /**
  * Returns an array of all the years that reviews have been written/published in.
  *
- * @param string $type  Date type - either `written` or `published`.
- * @param string $order Either ASC or DESC.
+ * @param  string  $type  Date type - either `written` or `published`.
+ * @param  string  $order  Either ASC or DESC.
  *
  * @return array
  */
-function get_review_years( $type = 'written', $order = 'DESC' ) {
+function get_review_years(string $type = 'written', string $order = 'DESC'): array
+{
+    global $wpdb;
 
-	global $wpdb;
-
-	$review_table = book_database()->get_table( 'reviews' )->get_table_name();
-	$date_type    = 'written' === $type ? 'date_written' : 'date_published';
-	$order        = 'DESC' === $order ? 'DESC' : 'ASC';
-	$years        = $wpdb->get_col( "SELECT DISTINCT YEAR( {$date_type} ) FROM {$review_table} WHERE {$date_type} IS NOT NULL ORDER BY {$date_type} {$order}" );
-
-	return $years;
+    $review_table = book_database()->get_table('reviews')->get_table_name();
+    $date_type    = 'written' === $type ? 'date_written' : 'date_published';
+    $order        = 'DESC' === $order ? 'DESC' : 'ASC';
 
+    return $wpdb->get_col("SELECT DISTINCT YEAR( {$date_type} ) FROM {$review_table} WHERE {$date_type} IS NOT NULL ORDER BY {$date_type} {$order}");
 }
 
 /**
@@ -247,8 +202,7 @@ function get_review_years( $type = 'written', $order = 'DESC' ) {
  *
  * @return array
  */
-function get_review_post_types() {
-	$post_types = array( 'post' );
-
-	return apply_filters( 'book-database/review-post-types', $post_types );
-}
\ No newline at end of file
+function get_review_post_types(): array
+{
+    return apply_filters('book-database/review-post-types', ['post']);
+}
diff --git a/includes/series/class-series.php b/includes/series/class-series.php
deleted file mode 100644
index b846c2d9..00000000
--- a/includes/series/class-series.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
- * Series Object
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Class Series
- * @package Book_Database
- */
-class Series extends Base_Object {
-
-	protected $name = '';
-
-	protected $slug = '';
-
-	protected $description = '';
-
-	protected $number_books = 0;
-
-	/**
-	 * Get the name of the series
-	 *
-	 * @return string
-	 */
-	public function get_name() {
-		return $this->name;
-	}
-
-	/**
-	 * Get the series slug
-	 *
-	 * @return string
-	 */
-	public function get_slug() {
-		return $this->slug;
-	}
-
-	/**
-	 * Get the series description
-	 *
-	 * @return string
-	 */
-	public function get_description() {
-		return $this->description;
-	}
-
-	/**
-	 * Get the number of books in the series
-	 *
-	 * Note: This is not the number of books present in the database with this series, but
-	 * rather the number of books PLANNED to be in the series. So if the series is a trilogy
-	 * but there's only one book in the database, this would return `3` because there are 3
-	 * books planned in the series. It's the length of the series.
-	 *
-	 * @return int
-	 */
-	public function get_number_books() {
-
-		if ( empty( $this->number_books ) ) {
-			$this->number_books = count_books( array( 'series_id' => $this->get_id() ) );
-		}
-
-		return absint( $this->number_books );
-
-	}
-
-	/**
-	 * Get the number of books in this series that have been read
-	 *
-	 * @return int
-	 */
-	public function get_number_books_read() {
-
-		global $wpdb;
-
-		$log_table  = book_database()->get_table( 'reading_log' )->get_table_name();
-		$book_table = book_database()->get_table( 'books' )->get_table_name();
-
-		$query       = $wpdb->prepare(
-			"SELECT COUNT( DISTINCT book_id )
-				FROM {$log_table} log
-			    INNER JOIN {$book_table} b ON log.book_id = b.id
-			WHERE series_id = %d
-			  AND date_finished IS NOT NULL
-			  AND user_id = %d",
-			$this->get_id(),
-			get_current_user_id()
-		);
-		$number_read = $wpdb->get_var( $query );
-
-		return absint( $number_read );
-
-	}
-
-	/**
-	 * Get the books in this series
-	 *
-	 * @param array $args
-	 *
-	 * @return Book[]
-	 */
-	public function get_books_in_series( $args = array() ) {
-
-		$args = wp_parse_args( $args, array(
-			'series_id' => $this->get_id(),
-			'number'    => 50,
-			'orderby'   => 'series_position',
-			'order'     => 'ASC'
-		) );
-
-		return get_books( $args );
-
-	}
-
-	/**
-	 * Get the average rating of all books in this series
-	 */
-	public function get_average_rating() {
-
-		global $wpdb;
-
-		$log_table  = book_database()->get_table( 'reading_log' )->get_table_name();
-		$book_table = book_database()->get_table( 'books' )->get_table_name();
-
-		$query   = $wpdb->prepare( "SELECT ROUND( AVG( rating ), 2 ) FROM {$log_table} log INNER JOIN {$book_table} b ON log.book_id = b.id WHERE series_id = %d AND rating IS NOT NULL", $this->get_id() );
-		$average = $wpdb->get_var( $query );
-
-		return $average;
-
-	}
-
-}
\ No newline at end of file
diff --git a/includes/series/series-functions.php b/includes/series/series-functions.php
index 23a3e1c4..4186170c 100644
--- a/includes/series/series-functions.php
+++ b/includes/series/series-functions.php
@@ -3,7 +3,7 @@
  * Series Functions
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
@@ -15,20 +15,24 @@
  * for the plural version. To get a single series by ID, use `get_book_series_by( 'id', $id )`
  */
 
+use Book_Database\Exceptions\Exception;
+use Book_Database\Models\Series;
+
 /**
  * Get a single series by a column name/value combo
  *
- * @param string $column_name
- * @param mixed  $column_value
+ * @param  string  $column_name
+ * @param  mixed  $column_value
  *
  * @return Series|false
  */
-function get_book_series_by( $column_name, $column_value ) {
-
-	$query = new Series_Query();
-
-	return $query->get_item_by( $column_name, $column_value );
-
+function get_book_series_by(string $column_name, $column_value)
+{
+    try {
+        return Series::findBy($column_name, $column_value);
+    } catch (\Exception $e) {
+        return false;
+    }
 }
 
 /**
@@ -62,114 +66,64 @@ function get_book_series_by( $column_name, $column_value ) {
  *
  * @return Series[] Array of Series objects.
  */
-function get_book_series( $args = array() ) {
-
-	$args = wp_parse_args( $args, array(
-		'number' => 20
-	) );
-
-	$query = new Series_Query();
-
-	return $query->query( $args );
-
+function get_book_series(array $args = []): array
+{
+    try {
+        return Series::query($args);
+    } catch (\Exception $e) {
+        return [];
+    }
 }
 
 /**
  * Count the series
  *
- * @param array $args
+ * @param  array  $args
  *
  * @see get_book_series() for accepted arguments.
  *
  * @return int
  */
-function count_book_series( $args = array() ) {
-
-	$args = wp_parse_args( $args, array(
-		'count' => true
-	) );
-
-	$query = new Series_Query( $args );
-
-	return absint( $query->found_items );
-
+function count_book_series(array $args = []): int
+{
+    try {
+        return Series::count($args);
+    } catch (\Exception $e) {
+        return 0;
+    }
 }
 
 /**
  * Add a new series
  *
- * @param array $args         {
+ * @param  array  $args  {
  *
- * @type string $name         Name of the series.
- * @type string $slug         Series slug. Omit to auto generate.
- * @type string $description  Description of the series.
- * @type int    $number_books Number of books planned for the series.
+ * @type string $name Name of the series.
+ * @type string $slug Series slug. Omit to auto generate.
+ * @type string $description Description of the series.
+ * @type int $number_books Number of books planned for the series.
  * }
  *
  * @return int ID of the newly created taxonomy.
- * @throws Exception
+ * @throws Exception|\Exception
  */
-function add_book_series( $args ) {
-
-	$args = wp_parse_args( $args, array(
-		'name'         => '',
-		'slug'         => '',
-		'description'  => '',
-		'number_books' => 1
-	) );
-
-	if ( empty( $args['name'] ) ) {
-		throw new Exception( 'missing_required_parameter', __( 'A taxonomy name is required.', 'book-database' ), 400 );
-	}
-
-	// Generate a slug.
-	$args['slug'] = ! empty( $args['slug'] ) ? unique_book_slug( $args['slug'], 'series' ) : unique_book_slug( sanitize_title( $args['name'] ), 'series' );
-
-	// Sanitize.
-	$args['slug'] = sanitize_key( $args['slug'] );
-
-	$query     = new Series_Query();
-	$series_id = $query->add_item( $args );
-
-	if ( empty( $series_id ) ) {
-		throw new Exception( 'database_error', __( 'Failed to insert new series into the database.', 'book-database' ), 500 );
-	}
-
-	return absint( $series_id );
-
+function add_book_series(array $args): int
+{
+    return Series::create($args);
 }
 
 /**
  * Update an existing series
  *
- * @param int   $series_id ID of the series to update.
- * @param array $args      Arguments to change.
+ * @param  int  $series_id  ID of the series to update.
+ * @param  array  $args  Arguments to change.
  *
  * @return bool
  * @throws Exception
  */
-function update_book_series( $series_id, $args = array() ) {
-
-	$series = get_book_series_by( 'id', $series_id );
-
-	if ( empty( $series ) ) {
-		throw new Exception( 'invalid_id', __( 'Invalid series ID.', 'book-database' ), 400 );
-	}
-
-	// If the slug is changing, let's re-generate it.
-	if ( isset( $args['slug'] ) && $args['slug'] != $series->get_slug() ) {
-		$args['slug'] = unique_book_slug( $args['slug'], 'series' );
-	}
-
-	$query   = new Series_Query();
-	$updated = $query->update_item( $series_id, $args );
-
-	if ( ! $updated ) {
-		throw new Exception( 'database_error', __( 'Failed to update the series.', 'book-database' ), 500 );
-	}
-
-	return true;
-
+function update_book_series(int $series_id, array $args = []): bool
+{
+    return Series::update($series_id, $args);
 }
 
 /**
@@ -177,59 +131,32 @@ function update_book_series( $series_id, $args = array() ) {
  *
  * This also updates the records of each book in this series to wipe their series_id and series_position.
  *
- * @param int $series_id ID of the book to delete.
+ * @param  int  $series_id  ID of the book to delete.
  *
  * @return bool
  * @throws Exception
  */
-function delete_book_series( $series_id ) {
-
-	$query   = new Series_Query();
-	$deleted = $query->delete_item( $series_id );
-
-	if ( ! $deleted ) {
-		throw new Exception( 'database_error', __( 'Failed to delete the series.', 'book-database' ), 500 );
-	}
-
-	// Get all the books in this series.
-	$books = get_books( array(
-		'series_id' => absint( $series_id ),
-		'number'    => 9999,
-		'fields'    => 'id'
-	) );
-
-	if ( $books ) {
-		/**
-		 * @var int[] $books
-		 */
-		// Remove series_id and series_position from each book.
-		foreach ( $books as $book_id ) {
-			update_book( $book_id, array(
-				'series_id'       => 0,
-				'series_position' => null
-			) );
-		}
-	}
-
-	return true;
+function delete_book_series(int $series_id): bool
+{
+    Series::delete($series_id);
 
+    return true;
 }
 
 /**
  * Get the series admin page URL.
  *
- * @param array $args Query args to append to the URL.
+ * @param  array  $args  Query args to append to the URL.
  *
  * @return string
  */
-function get_series_admin_page_url( $args = array() ) {
-
-	$sanitized_args = array();
+function get_series_admin_page_url(array $args = []): string
+{
+    $sanitized_args = array();
 
-	foreach ( $args as $key => $value ) {
-		$sanitized_args[ sanitize_key( $key ) ] = urlencode( $value );
-	}
+    foreach ($args as $key => $value) {
+        $sanitized_args[sanitize_key($key)] = urlencode($value);
+    }
 
-	return add_query_arg( $sanitized_args, admin_url( 'admin.php?page=bdb-series' ) );
-
-}
\ No newline at end of file
+    return add_query_arg($sanitized_args, admin_url('admin.php?page=bdb-series'));
+}
diff --git a/includes/shortcodes.php b/includes/shortcodes.php
deleted file mode 100644
index 56851f46..00000000
--- a/includes/shortcodes.php
+++ /dev/null
@@ -1,401 +0,0 @@
-<?php
-/**
- * Shortcodes
- *
- * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
- * @license   GPL2+
- */
-
-namespace Book_Database;
-
-/**
- * Book
- *
- * Display book information.
- *
- * @param array  $atts    Shortcode attributes.
- * @param string $content Shortcode content.
- *
- * @return string
- */
-function book_shortcode( $atts, $content = '' ) {
-
-	$atts = shortcode_atts( array(
-		'id'     => 0,
-		'rating' => null
-	), $atts, 'book' );
-
-	if ( empty( $atts['id'] ) || ! is_numeric( $atts['id'] ) ) {
-		return sprintf( __( 'Invalid book: %s', 'book-database' ), $atts['id'] );
-	}
-
-	$book = get_book( absint( $atts['id'] ) );
-
-	if ( ! $book instanceof Book ) {
-		return sprintf( __( 'Invalid book: %s', 'book-database' ), $atts['id'] );
-	}
-
-	$layout = new Book_Layout( $book );
-	$layout->set_rating( $atts['rating'] );
-
-	$html = $layout->get_html();
-
-	/**
-	 * Filters the [book] shortcode HTML.
-	 *
-	 * @param string $html    Formatted book layout.
-	 * @param Book   $book    Book object.
-	 * @param array  $atts    Shortcode attributes.
-	 * @param string $content Shortcode content.
-	 */
-	return apply_filters( 'book-database/shortcodes/book/output', $html, $book, $atts, $content );
-
-}
-
-add_shortcode( 'book', __NAMESPACE__ . '\book_shortcode' );
-
-/**
- * Book reviews
- *
- * Displays a list of book reviews with filters allowing users to change the parameters.
- *
- * @param array  $atts    Shortcode attributes.
- * @param string $content Shortcode content.
- *
- * @return string
- */
-function book_reviews_shortcode( $atts, $content = '' ) {
-
-	global $wp_query;
-
-	$atts = shortcode_atts( array(
-		'hide-future' => true,
-		'per-page'    => 20,
-		'filters'     => 'book_title book_author book_series rating genre publisher review_year orderby order',
-		'cover-size'  => 'medium'
-	), $atts, 'book-reviews' );
-
-	$atts['hide-future'] = filter_var( $atts['hide-future'], FILTER_VALIDATE_BOOLEAN );
-
-	$query   = new Book_Reviews_Query( $atts );
-	$filters = explode( ' ', $atts['filters'] );
-
-	ob_start();
-	?>
-	<form id="bdb-filter-book-reviews" action="<?php echo esc_url( get_permalink() ); ?>" method="GET">
-		<div class="bdb-filters">
-			<?php foreach ( $filters as $filter ) : ?>
-				<div class="bdb-filter-option">
-					<?php
-					switch ( $filter ) {
-						case 'book_title' :
-							$title = '';
-							if ( ! empty( $_GET['title'] ) ) {
-								$title = wp_strip_all_tags( $_GET['title'] );
-							}
-							?>
-							<label for="bdb-book-title"><?php _e( 'Book Title', 'book-database' ); ?></label>
-							<input type="text" id="bdb-book-title" name="title" value="<?php echo esc_attr( $title ); ?>">
-							<?php
-							break;
-
-						case 'book_author' :
-							$author = '';
-							if ( ! empty( $_GET['author'] ) ) {
-								$author = wp_strip_all_tags( $_GET['author'] );
-							} elseif ( ! empty( $wp_query->query_vars['book_tax'] ) && 'author' === $wp_query->query_vars['book_tax'] && ! empty( $wp_query->query_vars['book_term'] ) ) {
-								$slug   = $wp_query->query_vars['book_term'];
-								$author = get_book_author_by( 'slug', $slug );
-								$author = $author instanceof Author ? $author->get_name() : '';
-							}
-							?>
-							<label for="bdb-book-author"><?php _e( 'Book Author', 'book-database' ); ?></label>
-							<input type="text" id="bdb-book-author" name="author" value="<?php echo esc_attr( $author ); ?>">
-							<?php
-							break;
-
-						case 'book_series' :
-							$series = '';
-							if ( ! empty( $_GET['series'] ) ) {
-								$series = wp_strip_all_tags( $_GET['series'] );
-							} elseif ( ! empty( $wp_query->query_vars['book_tax'] ) && 'series' === $wp_query->query_vars['book_tax'] && ! empty( $wp_query->query_vars['book_term'] ) ) {
-								$slug   = $wp_query->query_vars['book_term'];
-								$series = get_book_series_by( 'slug', $slug );
-								$series = $series instanceof Series ? $series->get_name() : '';
-							}
-							?>
-							<label for="bdb-book-series"><?php _e( 'Book Series', 'book-database' ); ?></label>
-							<input type="text" id="bdb-book-series" name="series" value="<?php echo esc_attr( $series ); ?>">
-							<?php
-							break;
-
-						case 'rating' :
-							$selected_rating = 'any';
-							if ( ! empty( $_GET['rating'] ) ) {
-								$selected_rating = wp_strip_all_tags( $_GET['rating'] );
-							} elseif ( ! empty( $wp_query->query_vars['book_tax'] ) && 'rating' === $wp_query->query_vars['book_tax'] && ! empty( $wp_query->query_vars['book_term'] ) ) {
-								$selected_rating = $wp_query->query_vars['book_term'];
-							}
-							?>
-							<label for="bdb-book-rating"><?php _e( 'Rating', 'book-database' ); ?></label>
-							<select id="bdb-book-rating" name="rating">
-								<option value="any" <?php selected( $selected_rating, 'any' ); ?>><?php _e( 'Any', 'book-database' ); ?></option>
-								<?php foreach ( get_available_ratings() as $rating_value => $rating ) :
-									$rating_object = new Rating( $rating_value );
-									?>
-									<option value="<?php echo esc_attr( $rating_value ); ?>" <?php selected( $selected_rating, $rating_value ); ?>><?php echo esc_html( $rating_object->format_text() ); ?></option>
-								<?php endforeach; ?>
-							</select>
-							<?php
-							break;
-
-						case 'review_year' :
-							$years = get_review_years( 'published' );
-							$selected_year = $_GET['review_year'] ?? 'any';
-							?>
-							<label for="bdb-book-review-year"><?php _e( 'Review Year', 'book-database' ); ?></label>
-							<select id="bdb-book-review-year" name="review_year">
-								<option value="any" <?php selected( $selected_year, 'any' ); ?>><?php _e( 'Any', 'book-database' ); ?></option>
-								<?php foreach ( $years as $year ) : ?>
-									<option value="<?php echo esc_attr( $year ); ?>" <?php selected( $selected_year, $year ); ?>><?php echo esc_html( $year ); ?></option>
-								<?php endforeach; ?>
-							</select>
-							<?php
-							break;
-
-						case 'orderby' :
-							$orderby = $_GET['orderby'] ?? 'review.date_published';
-							?>
-							<label for="bdb-orderby"><?php _e( 'Order By', 'book-database' ); ?></label>
-							<select id="bdb-orderby" name="orderby">
-								<option value="author.name" <?php selected( $orderby, 'author.name' ); ?>><?php _e( 'Author Name', 'book-database' ); ?></option>
-								<option value="book.title" <?php selected( $orderby, 'book.title' ); ?>><?php _e( 'Book Title', 'book-database' ); ?></option>
-								<option value="book.pub_date" <?php selected( $orderby, 'book.pub_date' ); ?>><?php _e( 'Book Publish Date', 'book-database' ); ?></option>
-								<option value="log.date_finished" <?php selected( $orderby, 'log.date_finished' ); ?>><?php _e( 'Date Read', 'book-database' ); ?></option>
-								<option value="review.date_published" <?php selected( $orderby, 'review.date_published' ); ?>><?php _e( 'Date Reviewed', 'book-database' ); ?></option>
-								<option value="book.pages" <?php selected( $orderby, 'book.pages' ); ?>><?php _e( 'Number of Pages', 'book-database' ); ?></option>
-								<option value="log.rating" <?php selected( $orderby, 'log.rating' ); ?>><?php _e( 'Rating', 'book-database' ); ?></option>
-							</select>
-							<?php
-							break;
-
-						case 'order' :
-							$order = $_GET['order'] ?? 'DESC';
-							?>
-							<label for="bdb-order"><?php _e( 'Order', 'book-database' ); ?></label>
-							<select id="bdb-order" name="order">
-								<option value="ASC" <?php selected( $order, 'ASC' ); ?>><?php _e( 'ASC (1, 2, 3; a, b, c)', 'book-database' ); ?></option>
-								<option value="DESC" <?php selected( $order, 'DESC' ); ?>><?php _e( 'DESC (3, 2, 1; c, b, a)', 'book-database' ); ?></option>
-							</select>
-							<?php
-							break;
-
-						// Taxonomies
-						default :
-							$taxonomy = get_book_taxonomy_by( 'slug', $filter );
-
-							if ( ! $taxonomy instanceof Book_Taxonomy ) {
-								break;
-							}
-
-							$terms = get_book_terms( array(
-								'taxonomy' => $taxonomy->get_slug(),
-								'number'   => 300,
-								'orderby'  => 'name',
-								'order'    => 'ASC'
-							) );
-
-							$selected_term = 'any';
-							if ( ! empty( $_GET[ $taxonomy->get_slug() ] ) ) {
-								$selected_term = wp_strip_all_tags( $_GET[ $taxonomy->get_slug() ] );
-							} elseif ( ! empty( $wp_query->query_vars['book_tax'] ) && $taxonomy->get_slug() === $wp_query->query_vars['book_tax'] && ! empty( $wp_query->query_vars['book_term'] ) ) {
-								$slug = $wp_query->query_vars['book_term'];
-								$term = get_book_term_by( 'slug', $slug );
-
-								if ( $term instanceof Book_Term ) {
-									$selected_term = $term->get_id();
-								}
-							}
-							?>
-							<label for="bdb-<?php echo esc_attr( $taxonomy->get_slug() ); ?>"><?php echo esc_html( $taxonomy->get_name() ) ?></label>
-							<select id="bdb-<?php echo esc_attr( $taxonomy->get_slug() ); ?>" name="<?php echo esc_attr( $taxonomy->get_slug() ); ?>">
-								<option value="any" <?php selected( $selected_term, 'any' ); ?>><?php _e( 'Any', 'book-database' ); ?></option>
-								<?php foreach ( $terms as $term ) : ?>
-									<option value="<?php echo esc_attr( $term->get_id() ); ?>" <?php selected( $selected_term, $term->get_id() ); ?>><?php echo esc_html( $term->get_name() ); ?></option>
-								<?php endforeach; ?>
-							</select>
-							<?php
-							break;
-					}
-					?>
-				</div>
-			<?php endforeach; ?>
-		</div>
-		<div class="bdb-filter-actions">
-			<button type="submit"><?php _e( 'Filter', 'book-database' ); ?></button>
-			<a href="<?php echo esc_url( get_permalink() ); ?>" class="bdb-reset-search-filters"><?php _e( 'Clear filters &times;', 'book-database' ); ?></a>
-		</div>
-	</form>
-	<div id="bdb-reviews">
-		<?php
-		$reviews  = $query->get_results();
-		$template = get_book_template_part( 'shortcode-book-reviews-entry', '', false );
-
-		if ( ! empty( $reviews ) ) {
-			echo '<div class="bdb-review-list-number-results bdb-book-grid-number-results">' . sprintf( _n( '%s review found', '%s reviews found', $query->total_results, 'book-database' ), $query->total_results ) . '</div>';
-			echo '<div class="bdb-book-reviews-list bdb-book-grid">';
-			foreach ( $reviews as $review_data ) {
-				$review      = new Review( $review_data );
-				$book        = new Book( array(
-					'id'              => $review_data->book_id ?? 0,
-					'cover_id'        => $review_data->book_cover_id ?? null,
-					'title'           => $review_data->book_title ?? '',
-					'pub_date'        => $review_data->book_pub_date ?? '',
-					'series_position' => $review_data->series_position ?? ''
-				) );
-				$reading_log = new Reading_Log( array(
-					'date_started'        => $review_data->date_started_reading ?? null,
-					'date_finished'       => $review_data->date_finished_reading ?? null,
-					'percentage_complete' => $review_data->percentage_complete ?? null,
-					'rating'              => $review_data->rating ?? null
-				) );
-				include $template;
-			}
-			echo '</div>';
-		} else {
-			?>
-			<p><?php _e( 'No reviews found.', 'book-database' ); ?></p>
-			<?php
-		}
-
-		if ( $query->total_results > count( $reviews ) ) {
-			?>
-			<nav class="bdb-pagination bookdb-reviews-list-pagination pagination">
-				<?php echo $query->get_pagination(); ?>
-			</nav>
-		<?php } ?>
-	</div>
-	<?php
-
-	return ob_get_clean();
-
-}
-
-add_shortcode( 'book-reviews', __NAMESPACE__ . '\book_reviews_shortcode' );
-
-/**
- * Book grid
- *
- * Similar to `[book-reviews]` but filtering is done via shortcode attributes instead of
- * a front-end form. It also focuses on books rather than reviews.
- *
- * @param array  $atts    Shortcode attributes.
- * @param string $content Shortcode content.
- *
- * @return string
- */
-function book_grid_shortcode( $atts, $content = '' ) {
-
-	$default_atts = array(
-		'ids'                 => '',
-		'author'              => '',
-		'series'              => '',
-		'rating'              => '',
-		'pub-date-after'      => '',
-		'pub-date-before'     => '',
-		'pub-year'            => '',
-		'read-status'         => '',
-		'review-date-after'   => '',
-		'review-date-before'  => '',
-		'review-start-date'   => '', // Deprecated
-		'review-end-date'     => '', // Deprecated
-		'reviews-only'        => false,
-		'show-ratings'        => false,
-		'show-pub-date'       => true,
-		'show-goodreads-link' => false,
-		'show-purchase-links' => false,
-		'show-review-link'    => false,
-		'orderby'             => 'book.id',
-		'order'               => 'DESC',
-		'cover-size'          => 'large',
-		'per-page'            => 20,
-	);
-
-	foreach ( get_book_taxonomies( array( 'fields' => 'slug' ) ) as $tax_slug ) {
-		$default_atts[ $tax_slug ] = '';
-	}
-
-	$atts = shortcode_atts( $default_atts, $atts, 'book-grid' );
-
-	// Validate booleans.
-	$booleans = array( 'reviews-only', 'show-ratings', 'show-pub-date', 'show-goodreads-link', 'show-purchase-links', 'show-review-link' );
-	foreach ( $booleans as $boolean ) {
-		$atts[ $boolean ] = filter_var( $atts[ $boolean ], FILTER_VALIDATE_BOOLEAN );
-	}
-
-	// Replace "review-start-date" and "review-end-date".
-	if ( ! empty( $atts['review-start-date'] ) ) {
-		$atts['review-date-after'] = $atts['review-start-date'];
-	}
-	if ( ! empty( $atts['review-end-date'] ) ) {
-		$atts['review-date-before'] = $atts['review-end-date'];
-	}
-
-	$query = new Book_Grid_Query( $atts );
-
-	ob_start();
-	?>
-	<div id="bdb-books">
-		<?php
-		$books    = $query->get_results();
-		$template = get_book_template_part( 'shortcode-book-grid-entry', '', false );
-
-		if ( ! empty( $books ) ) {
-			echo '<div class="bdb-book-list-number-results bdb-book-grid-number-results">' . sprintf( _n( '%s book found', '%s books found', $query->total_results, 'book-database' ), $query->total_results ) . '</div>';
-			echo '<div class="bdb-book-list bdb-book-grid">';
-			foreach ( $books as $book_data ) {
-				$book   = new Book( $book_data );
-				$review = false;
-
-				// Create a review object if we can.
-				if ( ! empty( $book_data->review_id ) ) {
-					$review_data = array(
-						'id'             => $book_data->review_id ?? 0,
-						'book_id'        => $book->get_id(),
-						'reading_log_id' => $book_data->review_reading_log_id ?? null,
-						'user_id'        => $book_data->review_user_id ?? null,
-						'post_id'        => $book_data->review_post_id ?? null,
-						'url'            => $book_data->review_url ?? '',
-						'review'         => $book_data->review_review ?? '',
-						'date_written'   => $book_data->review_date_written ?? '',
-						'date_published' => $book_data->review_date_published ?? null,
-						'date_created'   => $book_data->review_date_created ?? '',
-						'date_modified'  => $book_data->review_date_modified ?? ''
-					);
-
-					$review = new Review( $review_data );
-				}
-
-				include $template;
-			}
-			echo '</div>';
-		} else {
-			?>
-			<p><?php _e( 'No books found.', 'book-database' ); ?></p>
-			<?php
-		}
-
-		if ( $query->total_results > count( $books ) ) {
-			?>
-			<nav class="bdb-pagination bdb-book-grid-pagination pagination">
-				<?php echo $query->get_pagination(); ?>
-			</nav>
-		<?php } ?>
-	</div>
-	<?php
-	return ob_get_clean();
-
-}
-
-add_shortcode( 'book-grid', __NAMESPACE__ . '\book_grid_shortcode' );
\ No newline at end of file
diff --git a/package.json b/package.json
index c89b597a..68be5957 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "book-database",
   "title": "Book Database",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "Maintain a database of books and reviews.",
   "author": "Ashley Gibson",
   "license": "GPL-2.0-or-later",
diff --git a/readme.txt b/readme.txt
index 307233eb..ca4e1912 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Author URI: https://www.nosegraze.com
 Plugin URI: https://shop.nosegraze.com/product/book-database/
 Requires at least: 4.4
-Tested up to: 5.8.3
+Tested up to: 5.9.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -21,6 +21,14 @@ Maintain a database of books and reviews.
 
 == Changelog ==
 
+= 1.3 - 18 April, 2022 =
+
+* Requirements: Minimum PHP version is now 7.1.
+* New Anonymous server data is now collected for analytics (PHP version, WP version, etc.).
+* Refactor: Update deprecated `block_categories` filter usage.
+* Dev: Set up Composer / autoloading.
+* Dev: Add Alpine.js.
+
 = 1.2.2 - 13 February, 2022 =
 
 * Fix: Admin "Unowned Books" filter not working.
diff --git a/includes/admin/abstract-class-list-table.php b/src/Admin/Utils/ListTable.php
similarity index 97%
rename from includes/admin/abstract-class-list-table.php
rename to src/Admin/Utils/ListTable.php
index 1dd074e8..753d0dc5 100644
--- a/includes/admin/abstract-class-list-table.php
+++ b/src/Admin/Utils/ListTable.php
@@ -3,11 +3,13 @@
  * Admin List Table Base Class
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2022, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database;
+namespace Book_Database\Admin\Utils;
+
+use Book_Database\Models\Model;
 
 // Load WP_List_Table if not loaded
 if ( ! class_exists( '\WP_List_Table' ) ) {
@@ -15,10 +17,10 @@
 }
 
 /**
- * Class List_Table
+ * Class ListTable
  * @package Book_Database
  */
-abstract class List_Table extends \WP_List_Table {
+abstract class ListTable extends \WP_List_Table {
 
 	/**
 	 * Number of items per page
@@ -258,7 +260,7 @@ public function get_views() {
 	/**
 	 * Render the checkbox column.
 	 *
-	 * @param Base_Object $object
+	 * @param Model $object
 	 *
 	 * @return string
 	 */
@@ -327,4 +329,4 @@ public function prepare_items() {
 	public function process_bulk_actions() {
 
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Analytics/Analytics.php b/src/Analytics/Analytics.php
new file mode 100644
index 00000000..c82f43ff
--- /dev/null
+++ b/src/Analytics/Analytics.php
@@ -0,0 +1,677 @@
+<?php
+/**
+ * Reading & Review Analytics
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Analytics;
+
+use Book_Database\ValueObjects\Rating;
+use function Book_Database\book_database;
+use function Book_Database\get_available_ratings;
+
+/**
+ * Class Analytics
+ *
+ * @package Book_Database
+ * @since 1.3 Namespace changed.
+ */
+class Analytics
+{
+
+    /**
+     * @var string Start date.
+     */
+    protected $start_date = '';
+
+    /**
+     * @var string End date.
+     */
+    protected $end_date = '';
+
+    /**
+     * @var array Arguments.
+     */
+    protected $args = array();
+
+    /**
+     * @var \wpdb
+     */
+    protected $wpdb;
+
+    /**
+     * @var array Database table names.
+     */
+    protected $tables = array();
+
+    /**
+     * @var null|array
+     */
+    protected $number_books_read_breakdown = null;
+
+    /**
+     * Reviews written during this period
+     *
+     * @var null|array
+     */
+    protected $reviews = null;
+
+    /**
+     * Analytics constructor.
+     *
+     * @param  string  $start_date
+     * @param  string  $end_date
+     * @param  array  $args
+     */
+    public function __construct(string $start_date, string $end_date, array $args = array())
+    {
+
+        global $wpdb;
+
+        $this->start_date = $start_date;
+        $this->end_date   = $end_date;
+        $this->args       = wp_parse_args($args, array(
+            'rating_format' => null
+        ));
+        $this->wpdb       = $wpdb;
+        $this->tables     = array(
+            'authors'     => book_database()->get_table('authors')->get_table_name(),
+            'author_r'    => book_database()->get_table('book_author_relationships')->get_table_name(),
+            'term_r'      => book_database()->get_table('book_term_relationships')->get_table_name(),
+            'book_terms'  => book_database()->get_table('book_terms')->get_table_name(),
+            'books'       => book_database()->get_table('books')->get_table_name(),
+            'editions'    => book_database()->get_table('editions')->get_table_name(),
+            'reading_log' => book_database()->get_table('reading_log')->get_table_name(),
+            'reviews'     => book_database()->get_table('reviews')->get_table_name(),
+            'series'      => book_database()->get_table('series')->get_table_name(),
+        );
+
+    }
+
+    /**
+     * Log the performed query
+     *
+     * This only actually logs if WP_DEBUG is enabled.
+     *
+     * @param  string  $query  MySQL query.
+     * @param  string  $method  Method name.
+     */
+    protected function log($query, $method)
+    {
+        if (defined('WP_DEBUG') && WP_DEBUG) {
+            error_log(sprintf("%s:\n%s", $method, $query));
+        }
+    }
+
+    /**
+     * Get a breakdown of how books were read
+     *
+     * Returns an array of `finished`, `dnf`, `rereads`, and `new`.
+     *
+     * @see Books_Finished_Count
+     * @see Books_DNF_Count
+     *
+     * @return array
+     */
+    public function get_number_books_read_breakdown(): array
+    {
+        if (is_array($this->number_books_read_breakdown)) {
+            return $this->number_books_read_breakdown;
+        }
+
+        $counts = array(
+            'finished' => 0,
+            'dnf'      => 0,
+            'rereads'  => 0,
+            'new'      => 0
+        );
+
+        /**
+         * Number of books finished.
+         */
+        $query = $this->wpdb->prepare(
+            "SELECT COUNT(*) FROM {$this->tables['reading_log']}
+				WHERE date_finished >= %s
+            	AND date_finished <= %s
+                AND date_finished IS NOT NULL
+                AND percentage_complete >= 1",
+            $this->start_date, $this->end_date
+        );
+
+        $this->log($query, __METHOD__.'\finished');
+
+        $counts['finished'] = absint($this->wpdb->get_var($query));
+
+        /**
+         * Number of books DNF
+         */
+        $query = $this->wpdb->prepare(
+            "SELECT COUNT(*)
+				FROM {$this->tables['reading_log']}
+				WHERE date_started >= %s
+				AND date_finished <= %s
+				AND date_finished IS NOT NULL
+				AND percentage_complete < 1",
+            $this->start_date,
+            $this->end_date
+        );
+
+        $this->log($query, __METHOD__.'\dnf');
+
+        $counts['dnf'] = absint($this->wpdb->get_var($query));
+
+        /**
+         * Count rereads
+         */
+        $query = $this->wpdb->prepare(
+            "SELECT ( COUNT(*) - 1 ) AS count, GROUP_CONCAT( date_finished SEPARATOR ',' ) AS date_finished, book_id
+				FROM {$this->tables['reading_log']} AS log
+				INNER JOIN {$this->tables['books']} AS book ON book.id = log.book_id
+				WHERE `date_finished` < %s
+				AND `date_finished` IS NOT NULL 
+				GROUP BY book_id",
+            $this->end_date
+        );
+
+        $this->log($query, __METHOD__.'\rereads');
+
+        $books_read = $this->wpdb->get_results($query);
+
+        if (! empty($books_read)) {
+            foreach ($books_read as $book_read) {
+                if ($book_read->count < 1) {
+                    continue;
+                }
+
+                $dates_finished    = explode(',', $book_read->date_finished);
+                $this_book_rereads = 0;
+
+                foreach ($dates_finished as $date_finished) {
+                    if ($date_finished >= $this->start_date && $date_finished <= $this->end_date) {
+                        $this_book_rereads++;
+                    }
+
+                    if ($this_book_rereads >= $book_read->count) {
+                        break;
+                    }
+                }
+
+                $counts['rereads'] += $this_book_rereads;
+            }
+        }
+
+        $counts['new'] = ($counts['finished'] + $counts['dnf']) - $counts['rereads'];
+
+        return $counts;
+    }
+
+    /**
+     * Returns the number of books that have been fully read/finished.
+     *
+     * @return int
+     */
+    public function get_number_books_finished(): int
+    {
+        $breakdown = $this->get_number_books_read_breakdown();
+
+        return absint($breakdown['finished']);
+    }
+
+    /**
+     * Returns the number of books that were marked as DNF
+     *
+     * @return int
+     */
+    public function get_number_dnf(): int
+    {
+        $breakdown = $this->get_number_books_read_breakdown();
+
+        return absint($breakdown['dnf']);
+    }
+
+    /**
+     * Get the number of new books that were read
+     *
+     * @return int
+     */
+    public function get_number_new_books(): int
+    {
+        $breakdown = $this->get_number_books_read_breakdown();
+
+        return absint($breakdown['new']);
+    }
+
+    /**
+     * Get the number of rereads
+     *
+     * @return int
+     */
+    public function get_number_rereads(): int
+    {
+        $breakdown = $this->get_number_books_read_breakdown();
+
+        return absint($breakdown['rereads']);
+    }
+
+    /**
+     * Get the number of pages read
+     *
+     * @see \Book_Database\Analytics\Datasets\Pages_Read
+     *
+     * @return int
+     */
+    public function get_number_pages_read(): int
+    {
+        $query = $this->wpdb->prepare(
+            "SELECT SUM(pages * percentage_complete) as pages_read
+				FROM {$this->tables['books']} AS book
+				INNER JOIN {$this->tables['reading_log']} AS log ON( log.book_id = book.id )
+				WHERE date_finished >= %s
+				AND date_finished <= %s
+				AND date_finished IS NOT NULL",
+            $this->start_date, $this->end_date
+        );
+
+        $this->log($query, __METHOD__);
+
+        $result = $this->wpdb->get_var($query);
+
+        return round(absint($result));
+    }
+
+    /**
+     * Calculate the number of books on track to be read in a given period
+     *
+     * @return int|null
+     */
+    public function get_reading_track(): ?int
+    {
+        try {
+
+            $books_read = $this->get_number_books_finished();
+
+            // If end date is in the past, return books read.
+            if (time() > strtotime($this->end_date)) {
+                return $books_read;
+            }
+
+            $now        = new \DateTime();
+            $start_date = new \DateTime($this->start_date);
+            $end_date   = new \DateTime($this->end_date);
+
+            // Calculate books read per day so far.
+            $days_in_period = $now->diff($start_date)->days;
+            $books_per_day  = ($days_in_period > 0) ? $books_read / $days_in_period : 0;
+
+            // Based on books per day, calculate how many we'll read in the remaining days.
+            $remaining_days = $end_date->diff($now)->days;
+            $left_to_read   = $books_per_day * $remaining_days;
+
+            return round($left_to_read + $books_read);
+
+        } catch (\Exception $e) {
+            return null;
+        }
+    }
+
+    /**
+     * Query for reviews written during this period
+     *
+     * @return object[]
+     */
+    public function query_reviews(): array
+    {
+        if (! is_null($this->reviews)) {
+            return $this->reviews;
+        }
+
+        $query = $this->wpdb->prepare(
+            "SELECT DISTINCT review.id, review.date_written, log.rating AS rating, book.id AS book_id, book.title AS book_title, GROUP_CONCAT(author.name SEPARATOR ', ') AS author_name
+				FROM {$this->tables['reviews']} AS review 
+				LEFT JOIN {$this->tables['reading_log']} AS log ON ( review.reading_log_id = log.id )
+				INNER JOIN {$this->tables['books']} AS book ON ( review.book_id = book.id )
+				LEFT JOIN {$this->tables['author_r']} AS ar ON ( book.id = ar.book_id )
+				INNER JOIN {$this->tables['authors']} AS author ON ( ar.author_id = author.id )
+				WHERE date_written >= %s 
+				AND date_written <= %s 
+				GROUP BY book.id
+				ORDER BY review.date_written DESC",
+            $this->start_date,
+            $this->end_date
+        );
+
+        $this->log($query, __METHOD__);
+
+        $this->reviews = $this->wpdb->get_results($query);
+
+        return $this->reviews;
+    }
+
+    /**
+     * Get the number of reviews
+     *
+     * @return int
+     */
+    public function get_number_reviews(): int
+    {
+        $reviews = $this->query_reviews();
+
+        return is_array($reviews) ? count($reviews) : 0;
+    }
+
+    /**
+     * Get the average star rating
+     *
+     * @return float|int
+     */
+    public function get_avg_rating()
+    {
+        $query = $this->wpdb->prepare(
+            "SELECT ROUND( AVG( rating ), 2 )
+			FROM {$this->tables['reading_log']}
+			WHERE rating IS NOT NULL 
+			AND date_finished >= %s 
+			AND date_finished <= %s 
+			AND date_finished IS NOT NULL",
+            $this->start_date,
+            $this->end_date
+        );
+
+        $this->log($query, __METHOD__);
+
+        $average = $this->wpdb->get_var($query);
+
+        return $average * 1;
+    }
+
+    /**
+     * Count the number of different series read
+     *
+     * @return int
+     */
+    public function get_number_different_series(): int
+    {
+        $query = $this->wpdb->prepare(
+            "SELECT COUNT( DISTINCT series_id )
+			FROM {$this->tables['reading_log']} AS log 
+			INNER JOIN {$this->tables['books']} AS book ON ( book.id = log.book_id )
+			WHERE date_finished >= %s 
+			AND date_finished <= %s 
+			AND date_finished IS NOT NULL 
+			AND series_id IS NOT NULL",
+            $this->start_date,
+            $this->end_date
+        );
+
+        $this->log($query, __METHOD__);
+
+        $number = $this->wpdb->get_var($query);
+
+        return absint($number);
+    }
+
+    /**
+     * Count the number of standalones read
+     *
+     * @return int
+     */
+    public function get_number_standalones(): int
+    {
+        $query = $this->wpdb->prepare(
+            "SELECT COUNT(*)
+			FROM {$this->tables['reading_log']} AS log 
+			INNER JOIN {$this->tables['books']} AS book ON ( book.id = log.book_id )
+			WHERE date_finished >= %s 
+			AND date_finished <= %s 
+			AND date_finished IS NOT NULL 
+			AND series_id IS NULL",
+            $this->start_date,
+            $this->end_date
+        );
+
+        $this->log($query, __METHOD__);
+
+        $number = $this->wpdb->get_var($query);
+
+        return absint($number);
+    }
+
+    /**
+     * Get the number of different authors
+     *
+     * @return int
+     */
+    public function get_number_authors(): int
+    {
+        $query = $this->wpdb->prepare(
+            "SELECT COUNT( DISTINCT ar.author_id )
+			FROM {$this->tables['author_r']} AS ar 
+			INNER JOIN {$this->tables['reading_log']} AS log ON ( ar.book_id = log.book_id )
+			WHERE date_finished >= %s 
+			AND date_finished <= %s 
+			AND date_finished IS NOT NULL",
+            $this->start_date,
+            $this->end_date
+        );
+
+        $this->log($query, __METHOD__);
+
+        $number = $this->wpdb->get_var($query);
+
+        return absint($number);
+    }
+
+    /**
+     * Get rating breakdown
+     *
+     * Returns an array of arrays, containing each available rating and the associated number of books.
+     */
+    public function get_rating_breakdown(): array
+    {
+        $query = $this->wpdb->prepare(
+            "SELECT rating, COUNT( IFNULL( rating, 1 ) ) AS count
+			FROM {$this->tables['reading_log']} AS log 
+			WHERE date_finished >= %s 
+			AND date_finished <= %s 
+			AND date_finished IS NOT NULL 
+			GROUP BY rating
+			ORDER BY rating DESC",
+            $this->start_date,
+            $this->end_date
+        );
+
+        $this->log($query, __METHOD__);
+
+        $results     = $this->wpdb->get_results($query);
+        $final_array = $temp_array = array();
+
+        foreach (get_available_ratings() as $rating => $label) {
+            $temp_array[$rating] = 0;
+        }
+
+        if (is_array($results)) {
+            foreach ($results as $result) {
+                $key              = (null === $result->rating) ? 'none' : (string) ($result->rating * 1);
+                $temp_array[$key] = absint($result->count);
+            }
+        }
+
+        foreach ($temp_array as $key => $value) {
+            $rating        = new Rating($key);
+            $final_array[] = array(
+                'rating'       => 'none' === $key ? 'none' : $rating->format($this->args['rating_format']),
+                'number_books' => $value
+            );
+        }
+
+        return $final_array;
+    }
+
+    /**
+     * Get pages breakdown
+     *
+     * Returns a table containing page ranges, along with how many books fell into that range.
+     * Example:
+     *
+     * +------------+-----------------+
+     * | page_range | number of books |
+     * +------------+-----------------+
+     * | 0-199      |               2 |
+     * | 200-399    |               6 |
+     * | 400-599    |               1 |
+     * +------------+-----------------+
+     *
+     * @param  int  $number_range  Number of pages in each range.
+     *
+     * @return array
+     */
+    public function get_pages_breakdown(int $number_range = 200): array
+    {
+        $query = $this->wpdb->prepare(
+            "SELECT CONCAT( %d * FLOOR( pages/%d ), '-', %d * FLOOR( pages/%d ) + %d ) AS page_range, COUNT(*) AS number_books
+			FROM {$this->tables['reading_log']} AS log 
+			INNER JOIN {$this->tables['books']} AS book ON ( book.id = log.book_id )
+			WHERE date_finished >= %s
+			AND date_finished <= %s 
+			AND date_finished IS NOT NULL 
+			AND book.pages IS NOT NULL 
+			GROUP BY 1
+			ORDER BY pages",
+            absint($number_range),
+            absint($number_range),
+            absint($number_range),
+            absint($number_range),
+            absint($number_range - 1),
+            $this->start_date,
+            $this->end_date
+        );
+
+        $this->log($query, __NAMESPACE__);
+
+        $breakdown = $this->wpdb->get_results($query, ARRAY_A);
+
+        if (! is_array($breakdown)) {
+            $breakdown = array();
+        }
+
+        return $breakdown;
+    }
+
+    /**
+     * Get taxonomy breakdown
+     *
+     * For each term: number of books read, average rating, and term name.
+     *
+     * @param  string  $taxonomy  Taxonomy slug
+     *
+     * @return array|object|null
+     */
+    public function get_taxonomy_breakdown(string $taxonomy)
+    {
+        $query = $this->wpdb->prepare(
+            "SELECT COUNT( log.id ) AS number_books_read, ROUND( AVG( log.rating ), 2 ) AS average_rating, COUNT( review.id ) AS number_reviews, term.name AS term_name
+			FROM {$this->tables['reading_log']} AS log 
+			LEFT JOIN {$this->tables['reviews']} AS review ON ( review.reading_log_id = log.id )
+			INNER JOIN {$this->tables['term_r']} AS tr ON ( tr.book_id = log.book_id )
+			INNER JOIN {$this->tables['book_terms']} AS term ON ( term.id = tr.term_id )
+			WHERE date_finished >= %s 
+			AND date_finished <= %s 
+			AND date_finished IS NOT NULL 
+			AND term.taxonomy = %s 
+			GROUP BY term.taxonomy, term.name 
+			ORDER BY term.name ASC",
+            $this->start_date,
+            $this->end_date,
+            $taxonomy
+        );
+
+        $this->log($query, __NAMESPACE__);
+
+        $results = $this->wpdb->get_results($query);
+
+        // Format rating.
+        foreach ($results as $key => $result) {
+            $rating                        = new Rating($result->average_rating);
+            $results[$key]->average_rating = $rating->format($this->args['rating_format']);
+        }
+
+        return $results;
+    }
+
+    /**
+     * Get a list of reviews written
+     *
+     * Limited to 20 results.
+     *
+     * @return object[]|array|null
+     */
+    public function get_reviews_written(): ?array
+    {
+        $reviews = $this->query_reviews();
+
+        if (! is_array($reviews)) {
+            return null;
+        }
+
+        // Limit results to 20.
+        if (count($reviews) > 20) {
+            $reviews = array_slice($reviews, 0, 20);
+        }
+
+        foreach ($reviews as $key => $review) {
+            $rating                      = new Rating($review->rating);
+            $reviews[$key]->rating       = $rating->format_html_stars();
+            $reviews[$key]->rating_class = $rating->format_html_class();
+        }
+
+        return $reviews;
+    }
+
+    /**
+     * Get a list of books that have been read but not reviewed
+     *
+     * Limited to 20 results.
+     *
+     * @return object[]|array|null
+     */
+    public function get_read_not_reviewed(): ?array
+    {
+        $query = $this->wpdb->prepare(
+            "SELECT DISTINCT log.id, log.date_started, log.date_finished, log.rating, log.percentage_complete, book.id AS book_id, book.title AS book_title, GROUP_CONCAT(author.name SEPARATOR ', ') AS author_name
+			FROM {$this->tables['reading_log']} AS log 
+			INNER JOIN {$this->tables['books']} AS book ON ( log.book_id = book.id )
+			LEFT JOIN {$this->tables['author_r']} AS ar ON ( log.book_id = ar.book_id )
+			INNER JOIN {$this->tables['authors']} AS author ON ( ar.author_id = author.id )
+			LEFT JOIN {$this->tables['reviews']} AS review ON ( book.id = review.book_id )
+			WHERE date_finished >= %s 
+			AND date_finished <= %s 
+			AND date_finished IS NOT NULL 
+			AND review.book_id IS NULL
+			GROUP BY book.id 
+			ORDER BY log.date_finished DESC 
+			LIMIT 20",
+            $this->start_date,
+            $this->end_date
+        );
+
+        $this->log($query, __METHOD__);
+
+        $books = $this->wpdb->get_results($query);
+
+        if (! is_array($books)) {
+            return null;
+        }
+
+        foreach ($books as $key => $book) {
+            $rating                    = new Rating($book->rating);
+            $books[$key]->rating       = $rating->format_html_stars();
+            $books[$key]->rating_class = $rating->format_html_class();
+        }
+
+        return $books;
+    }
+
+}
diff --git a/includes/analytics/graphs/class-bar-graph.php b/src/Analytics/Bar_Graph.php
similarity index 88%
rename from includes/analytics/graphs/class-bar-graph.php
rename to src/Analytics/Bar_Graph.php
index a682e940..f4c02219 100644
--- a/includes/analytics/graphs/class-bar-graph.php
+++ b/src/Analytics/Bar_Graph.php
@@ -3,7 +3,7 @@
  * Bar Graph
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
@@ -26,4 +26,4 @@ class Bar_Graph extends Graph {
 	 */
 	protected $series_type = 'ColumnSeries';
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/abstract-class-dataset.php b/src/Analytics/Dataset.php
similarity index 98%
rename from includes/analytics/abstract-class-dataset.php
rename to src/Analytics/Dataset.php
index 088a2a4c..cfe13070 100644
--- a/includes/analytics/abstract-class-dataset.php
+++ b/src/Analytics/Dataset.php
@@ -3,7 +3,7 @@
  * Base Dataset Class
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
@@ -155,4 +155,4 @@ protected function log( $message, $method ) {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-average-days-acquired-to-read.php b/src/Analytics/Datasets/Average_Days_Acquired_to_Read.php
similarity index 89%
rename from includes/analytics/datasets/class-average-days-acquired-to-read.php
rename to src/Analytics/Datasets/Average_Days_Acquired_to_Read.php
index 15f11d80..5c50b91d 100644
--- a/includes/analytics/datasets/class-average-days-acquired-to-read.php
+++ b/src/Analytics/Datasets/Average_Days_Acquired_to_Read.php
@@ -3,12 +3,13 @@
  * Dataset: Average number of days between acquiring a book and starting to read a book
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -44,4 +45,4 @@ protected function _get_dataset() {
 		return is_null( $days ) ? '&ndash;' : absint( $days );
 
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-average-days-finish-book.php b/src/Analytics/Datasets/Average_Days_Finish_Book.php
similarity index 85%
rename from includes/analytics/datasets/class-average-days-finish-book.php
rename to src/Analytics/Datasets/Average_Days_Finish_Book.php
index 25ff9b8d..bea0fba6 100644
--- a/includes/analytics/datasets/class-average-days-finish-book.php
+++ b/src/Analytics/Datasets/Average_Days_Finish_Book.php
@@ -3,12 +3,13 @@
  * Dataset: Average number of days to finish a book
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -34,4 +35,4 @@ protected function _get_dataset() {
 		return $this->get_db()->get_var( $query );
 
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-average-rating.php b/src/Analytics/Datasets/Average_Rating.php
similarity index 86%
rename from includes/analytics/datasets/class-average-rating.php
rename to src/Analytics/Datasets/Average_Rating.php
index 66613393..348a2ff3 100644
--- a/includes/analytics/datasets/class-average-rating.php
+++ b/src/Analytics/Datasets/Average_Rating.php
@@ -3,12 +3,13 @@
  * class-average-rating.php
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -45,4 +46,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-books-per-year.php b/src/Analytics/Datasets/Books_Per_Year.php
similarity index 94%
rename from includes/analytics/datasets/class-books-per-year.php
rename to src/Analytics/Datasets/Books_Per_Year.php
index 5b6d621a..24212a13 100644
--- a/includes/analytics/datasets/class-books-per-year.php
+++ b/src/Analytics/Datasets/Books_Per_Year.php
@@ -3,12 +3,14 @@
  * class-books-per-year.php
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Bar_Graph;
+use Book_Database\Analytics\Dataset;
 use DateInterval;
 use DatePeriod;
 use DateTime;
@@ -121,4 +123,4 @@ protected function _get_dataset() {
 		return $graph->get_args();
 
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-books-read-over-time.php b/src/Analytics/Datasets/Books_Read_Over_Time.php
similarity index 95%
rename from includes/analytics/datasets/class-books-read-over-time.php
rename to src/Analytics/Datasets/Books_Read_Over_Time.php
index 7c0db776..3f372b23 100644
--- a/includes/analytics/datasets/class-books-read-over-time.php
+++ b/src/Analytics/Datasets/Books_Read_Over_Time.php
@@ -3,12 +3,14 @@
  * Dataset: Books Read Over Time
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Bar_Graph;
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -137,4 +139,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-books-read-by-publication-year.php b/src/Analytics/Datasets/Books_Read_by_Publication_Year.php
similarity index 93%
rename from includes/analytics/datasets/class-books-read-by-publication-year.php
rename to src/Analytics/Datasets/Books_Read_by_Publication_Year.php
index 55897436..4e25f3c7 100644
--- a/includes/analytics/datasets/class-books-read-by-publication-year.php
+++ b/src/Analytics/Datasets/Books_Read_by_Publication_Year.php
@@ -3,12 +3,14 @@
  * Dataset: Books Read by Publication Year
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
+use Book_Database\Analytics\Scatter_Chart;
 use function Book_Database\book_database;
 
 /**
@@ -110,4 +112,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-edition-format-breakdown.php b/src/Analytics/Datasets/Edition_Format_Breakdown.php
similarity index 90%
rename from includes/analytics/datasets/class-edition-format-breakdown.php
rename to src/Analytics/Datasets/Edition_Format_Breakdown.php
index 7b17dd85..612e5612 100644
--- a/includes/analytics/datasets/class-edition-format-breakdown.php
+++ b/src/Analytics/Datasets/Edition_Format_Breakdown.php
@@ -3,12 +3,14 @@
  * Dataset: Edition Format Breakdown
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
+use Book_Database\Analytics\Pie_Chart;
 use function Book_Database\book_database;
 use function Book_Database\get_book_formats;
 
@@ -78,4 +80,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-edition-genre-breakdown.php b/src/Analytics/Datasets/Edition_Genre_Breakdown.php
similarity index 90%
rename from includes/analytics/datasets/class-edition-genre-breakdown.php
rename to src/Analytics/Datasets/Edition_Genre_Breakdown.php
index d2c6a610..01f15989 100644
--- a/includes/analytics/datasets/class-edition-genre-breakdown.php
+++ b/src/Analytics/Datasets/Edition_Genre_Breakdown.php
@@ -3,12 +3,14 @@
  * Dataset: Edition Genre Breakdown
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
+use Book_Database\Analytics\Pie_Chart;
 use function Book_Database\book_database;
 
 /**
@@ -68,4 +70,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-edition-source-breakdown.php b/src/Analytics/Datasets/Edition_Source_Breakdown.php
similarity index 89%
rename from includes/analytics/datasets/class-edition-source-breakdown.php
rename to src/Analytics/Datasets/Edition_Source_Breakdown.php
index 43d62aca..bacd96ca 100644
--- a/includes/analytics/datasets/class-edition-source-breakdown.php
+++ b/src/Analytics/Datasets/Edition_Source_Breakdown.php
@@ -3,12 +3,14 @@
  * Dataset: Edition Source Breakdown
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
+use Book_Database\Analytics\Pie_Chart;
 use function Book_Database\book_database;
 
 /**
@@ -63,4 +65,4 @@ protected function _get_dataset() {
 		return $chart->get_args();
 
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-editions-over-time.php b/src/Analytics/Datasets/Editions_Over_Time.php
similarity index 94%
rename from includes/analytics/datasets/class-editions-over-time.php
rename to src/Analytics/Datasets/Editions_Over_Time.php
index 50074927..492229bd 100644
--- a/includes/analytics/datasets/class-editions-over-time.php
+++ b/src/Analytics/Datasets/Editions_Over_Time.php
@@ -3,12 +3,14 @@
  * Dataset: Editions Acquired Over Time
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Bar_Graph;
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -130,4 +132,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-format-breakdown.php b/src/Analytics/Datasets/Format_Breakdown.php
similarity index 91%
rename from includes/analytics/datasets/class-format-breakdown.php
rename to src/Analytics/Datasets/Format_Breakdown.php
index 7ef3db3a..dc8fd6b8 100644
--- a/includes/analytics/datasets/class-format-breakdown.php
+++ b/src/Analytics/Datasets/Format_Breakdown.php
@@ -3,12 +3,14 @@
  * Dataset: Format Breakdown
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
+use Book_Database\Analytics\Pie_Chart;
 use function Book_Database\book_database;
 use function Book_Database\get_book_formats;
 
@@ -82,4 +84,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-highest-rated-books.php b/src/Analytics/Datasets/Highest_Rated_Books.php
similarity index 88%
rename from includes/analytics/datasets/class-highest-rated-books.php
rename to src/Analytics/Datasets/Highest_Rated_Books.php
index f668d5a4..d7d3aef7 100644
--- a/includes/analytics/datasets/class-highest-rated-books.php
+++ b/src/Analytics/Datasets/Highest_Rated_Books.php
@@ -3,13 +3,14 @@
  * Dataset: Highest Rated Books
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
-use Book_Database\Rating;
+use Book_Database\Analytics\Dataset;
+use Book_Database\ValueObjects\Rating;
 use function Book_Database\book_database;
 use function Book_Database\format_date;
 
@@ -53,4 +54,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-library-book-releases.php b/src/Analytics/Datasets/Library_Book_Releases.php
similarity index 90%
rename from includes/analytics/datasets/class-library-book-releases.php
rename to src/Analytics/Datasets/Library_Book_Releases.php
index 7e6e78ef..4f101373 100644
--- a/includes/analytics/datasets/class-library-book-releases.php
+++ b/src/Analytics/Datasets/Library_Book_Releases.php
@@ -3,14 +3,16 @@
  * Dataset: Books Releasing During This Period
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 use function Book_Database\format_date;
+use function wp_get_attachment_image_url;
 
 /**
  * Class Library_Book_Releases
@@ -55,4 +57,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-library-genre-breakdown.php b/src/Analytics/Datasets/Library_Genre_Breakdown.php
similarity index 90%
rename from includes/analytics/datasets/class-library-genre-breakdown.php
rename to src/Analytics/Datasets/Library_Genre_Breakdown.php
index 50cedc1f..4edf8395 100644
--- a/includes/analytics/datasets/class-library-genre-breakdown.php
+++ b/src/Analytics/Datasets/Library_Genre_Breakdown.php
@@ -3,12 +3,14 @@
  * Dataset: Library Genre Breakdown
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
+use Book_Database\Analytics\Pie_Chart;
 use function Book_Database\book_database;
 
 /**
@@ -67,4 +69,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-longest-book-read.php b/src/Analytics/Datasets/Longest_Book_Read.php
similarity index 62%
rename from includes/analytics/datasets/class-longest-book-read.php
rename to src/Analytics/Datasets/Longest_Book_Read.php
index c65cc6d0..2a3af60b 100644
--- a/includes/analytics/datasets/class-longest-book-read.php
+++ b/src/Analytics/Datasets/Longest_Book_Read.php
@@ -3,11 +3,13 @@
  * Dataset: Longest book read
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
+
+use Book_Database\Analytics\Datasets\Shortest_Book_Read;
 
 /**
  * Class Longest_Book_Read
@@ -18,4 +20,4 @@ class Longest_Book_Read extends Shortest_Book_Read {
 
 	protected $orderby = 'DESC';
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-lowest-rated-books.php b/src/Analytics/Datasets/Lowest_Rated_Books.php
similarity index 90%
rename from includes/analytics/datasets/class-lowest-rated-books.php
rename to src/Analytics/Datasets/Lowest_Rated_Books.php
index 4e0425c8..5487de30 100644
--- a/includes/analytics/datasets/class-lowest-rated-books.php
+++ b/src/Analytics/Datasets/Lowest_Rated_Books.php
@@ -3,13 +3,14 @@
  * Dataset: Lowest Rated Books
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
-use Book_Database\Rating;
+use Book_Database\Analytics\Dataset;
+use Book_Database\ValueObjects\Rating;
 use function Book_Database\book_database;
 use function Book_Database\format_date;
 
@@ -64,4 +65,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-most-read-genres.php b/src/Analytics/Datasets/Most_Read_Genres.php
similarity index 94%
rename from includes/analytics/datasets/class-most-read-genres.php
rename to src/Analytics/Datasets/Most_Read_Genres.php
index b17b14cb..18489759 100644
--- a/includes/analytics/datasets/class-most-read-genres.php
+++ b/src/Analytics/Datasets/Most_Read_Genres.php
@@ -3,12 +3,13 @@
  * Dataset: Most Read Genres
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -78,4 +79,4 @@ protected function _get_dataset() {
 		return $results;
 
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-number-books-added.php b/src/Analytics/Datasets/Number_Books_Added.php
similarity index 82%
rename from includes/analytics/datasets/class-number-books-added.php
rename to src/Analytics/Datasets/Number_Books_Added.php
index e8668316..43c0fe7d 100644
--- a/includes/analytics/datasets/class-number-books-added.php
+++ b/src/Analytics/Datasets/Number_Books_Added.php
@@ -3,12 +3,13 @@
  * Dataset: Number of Books Added
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -36,4 +37,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-number-different-authors-read.php b/src/Analytics/Datasets/Number_Different_Authors_Read.php
similarity index 88%
rename from includes/analytics/datasets/class-number-different-authors-read.php
rename to src/Analytics/Datasets/Number_Different_Authors_Read.php
index df4851da..0d12a028 100644
--- a/includes/analytics/datasets/class-number-different-authors-read.php
+++ b/src/Analytics/Datasets/Number_Different_Authors_Read.php
@@ -3,12 +3,13 @@
  * Dataset: Number of Different Authors
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -42,4 +43,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-number-different-series-read.php b/src/Analytics/Datasets/Number_Different_Series_Read.php
similarity index 88%
rename from includes/analytics/datasets/class-number-different-series-read.php
rename to src/Analytics/Datasets/Number_Different_Series_Read.php
index c8e80dd5..9504340e 100644
--- a/includes/analytics/datasets/class-number-different-series-read.php
+++ b/src/Analytics/Datasets/Number_Different_Series_Read.php
@@ -3,13 +3,13 @@
  * Dataset: Number of Different Series Read
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
-
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -44,4 +44,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-number-distinct-authors-added.php b/src/Analytics/Datasets/Number_Distinct_Authors_Added.php
similarity index 86%
rename from includes/analytics/datasets/class-number-distinct-authors-added.php
rename to src/Analytics/Datasets/Number_Distinct_Authors_Added.php
index 28af2e7e..dd24f67d 100644
--- a/includes/analytics/datasets/class-number-distinct-authors-added.php
+++ b/src/Analytics/Datasets/Number_Distinct_Authors_Added.php
@@ -3,12 +3,13 @@
  * Dataset: Number of Distinct Authors Added
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -38,4 +39,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-number-editions.php b/src/Analytics/Datasets/Number_Editions.php
similarity index 84%
rename from includes/analytics/datasets/class-number-editions.php
rename to src/Analytics/Datasets/Number_Editions.php
index a43e3e13..2abb1de5 100644
--- a/includes/analytics/datasets/class-number-editions.php
+++ b/src/Analytics/Datasets/Number_Editions.php
@@ -3,12 +3,13 @@
  * Dataset: Number Editions Added
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -40,4 +41,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-number-reviews-written.php b/src/Analytics/Datasets/Number_Reviews_Written.php
similarity index 85%
rename from includes/analytics/datasets/class-number-reviews-written.php
rename to src/Analytics/Datasets/Number_Reviews_Written.php
index b06f7ed4..94f3bbb0 100644
--- a/includes/analytics/datasets/class-number-reviews-written.php
+++ b/src/Analytics/Datasets/Number_Reviews_Written.php
@@ -3,12 +3,13 @@
  * Dataset: Number of Reviews Written
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -40,4 +41,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-number-series-books-added.php b/src/Analytics/Datasets/Number_Series_Books_Added.php
similarity index 83%
rename from includes/analytics/datasets/class-number-series-books-added.php
rename to src/Analytics/Datasets/Number_Series_Books_Added.php
index aaea82ef..25602d14 100644
--- a/includes/analytics/datasets/class-number-series-books-added.php
+++ b/src/Analytics/Datasets/Number_Series_Books_Added.php
@@ -3,12 +3,13 @@
  * Dataset: Number of Series Books Added
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -36,4 +37,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-number-signed-editions.php b/src/Analytics/Datasets/Number_Signed_Editions.php
similarity index 85%
rename from includes/analytics/datasets/class-number-signed-editions.php
rename to src/Analytics/Datasets/Number_Signed_Editions.php
index 7c5fa881..f80fdbb1 100644
--- a/includes/analytics/datasets/class-number-signed-editions.php
+++ b/src/Analytics/Datasets/Number_Signed_Editions.php
@@ -3,12 +3,13 @@
  * Dataset: Number Signed Editions Added
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -41,4 +42,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-number-standalones-added.php b/src/Analytics/Datasets/Number_Standalones_Added.php
similarity index 83%
rename from includes/analytics/datasets/class-number-standalones-added.php
rename to src/Analytics/Datasets/Number_Standalones_Added.php
index d629b776..e8fac498 100644
--- a/includes/analytics/datasets/class-number-standalones-added.php
+++ b/src/Analytics/Datasets/Number_Standalones_Added.php
@@ -3,12 +3,13 @@
  * Dataset: Number of Standalones Added
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -36,4 +37,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-number-standalones-read.php b/src/Analytics/Datasets/Number_Standalones_Read.php
similarity index 87%
rename from includes/analytics/datasets/class-number-standalones-read.php
rename to src/Analytics/Datasets/Number_Standalones_Read.php
index 8fb549fb..531dcacd 100644
--- a/includes/analytics/datasets/class-number-standalones-read.php
+++ b/src/Analytics/Datasets/Number_Standalones_Read.php
@@ -3,13 +3,13 @@
  * Dataset: Number of Standalones Read
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
-
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -44,4 +44,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-pages-breakdown.php b/src/Analytics/Datasets/Pages_Breakdown.php
similarity index 90%
rename from includes/analytics/datasets/class-pages-breakdown.php
rename to src/Analytics/Datasets/Pages_Breakdown.php
index af63d805..4b51e692 100644
--- a/includes/analytics/datasets/class-pages-breakdown.php
+++ b/src/Analytics/Datasets/Pages_Breakdown.php
@@ -3,12 +3,14 @@
  * Dataset: Pages Breakdown
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
+use Book_Database\Analytics\Pie_Chart;
 use function Book_Database\book_database;
 
 /**
@@ -73,4 +75,4 @@ protected function _get_dataset() {
 		return $chart->get_args();
 
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-pages-read.php b/src/Analytics/Datasets/Pages_Read.php
similarity index 87%
rename from includes/analytics/datasets/class-pages-read.php
rename to src/Analytics/Datasets/Pages_Read.php
index c35dcb38..359e3e8d 100644
--- a/includes/analytics/datasets/class-pages-read.php
+++ b/src/Analytics/Datasets/Pages_Read.php
@@ -3,12 +3,13 @@
  * Number of Pages Read
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -41,4 +42,4 @@ protected function _get_dataset() {
 		return round( absint( $result ) );
 
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-ratings-breakdown.php b/src/Analytics/Datasets/Ratings_Breakdown.php
similarity index 90%
rename from includes/analytics/datasets/class-ratings-breakdown.php
rename to src/Analytics/Datasets/Ratings_Breakdown.php
index 4f9c60c1..22b386fe 100644
--- a/includes/analytics/datasets/class-ratings-breakdown.php
+++ b/src/Analytics/Datasets/Ratings_Breakdown.php
@@ -3,12 +3,14 @@
  * Dataset: Ratings Breakdown
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
+use Book_Database\Analytics\Pie_Chart;
 use function Book_Database\book_database;
 
 /**
@@ -69,4 +71,4 @@ protected function _get_dataset() {
 		return $chart->get_args();
 
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-reading-overview.php b/src/Analytics/Datasets/Reading_Overview.php
similarity index 95%
rename from includes/analytics/datasets/class-reading-overview.php
rename to src/Analytics/Datasets/Reading_Overview.php
index 396ed212..7b983066 100644
--- a/includes/analytics/datasets/class-reading-overview.php
+++ b/src/Analytics/Datasets/Reading_Overview.php
@@ -3,12 +3,13 @@
  * Dataset: Reading Overview
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -112,4 +113,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-reading-track.php b/src/Analytics/Datasets/Reading_Track.php
similarity index 91%
rename from includes/analytics/datasets/class-reading-track.php
rename to src/Analytics/Datasets/Reading_Track.php
index a6ae900b..521d001f 100644
--- a/includes/analytics/datasets/class-reading-track.php
+++ b/src/Analytics/Datasets/Reading_Track.php
@@ -3,12 +3,13 @@
  * Dataset: Reading Track
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -61,4 +62,4 @@ protected function _get_dataset() {
 		}
 
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-reviews-over-time.php b/src/Analytics/Datasets/Reviews_Over_Time.php
similarity index 94%
rename from includes/analytics/datasets/class-reviews-over-time.php
rename to src/Analytics/Datasets/Reviews_Over_Time.php
index a5c22b48..1c8ecc05 100644
--- a/includes/analytics/datasets/class-reviews-over-time.php
+++ b/src/Analytics/Datasets/Reviews_Over_Time.php
@@ -3,12 +3,14 @@
  * Dataset: Reviews Written Over Time
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
+use Book_Database\Analytics\Bar_Graph;
+use Book_Database\Analytics\Dataset;
 use function Book_Database\book_database;
 
 /**
@@ -130,4 +132,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-reviews-written.php b/src/Analytics/Datasets/Reviews_Written.php
similarity index 92%
rename from includes/analytics/datasets/class-reviews-written.php
rename to src/Analytics/Datasets/Reviews_Written.php
index 8d1da2d3..436e66d9 100644
--- a/includes/analytics/datasets/class-reviews-written.php
+++ b/src/Analytics/Datasets/Reviews_Written.php
@@ -3,13 +3,14 @@
  * Dataset: Reviews Written
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
-use Book_Database\Rating;
+use Book_Database\Analytics\Dataset;
+use Book_Database\ValueObjects\Rating;
 use function Book_Database\book_database;
 use function Book_Database\format_date;
 
@@ -65,4 +66,4 @@ protected function _get_dataset() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-shortest-book-read.php b/src/Analytics/Datasets/Shortest_Book_Read.php
similarity index 90%
rename from includes/analytics/datasets/class-shortest-book-read.php
rename to src/Analytics/Datasets/Shortest_Book_Read.php
index f75a77de..a853cc0a 100644
--- a/includes/analytics/datasets/class-shortest-book-read.php
+++ b/src/Analytics/Datasets/Shortest_Book_Read.php
@@ -3,13 +3,14 @@
  * Dataset: Shortest book read
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
-use Book_Database\Book;
+use Book_Database\Analytics\Dataset;
+use Book_Database\Models\Book;
 use function Book_Database\book_database;
 use function Book_Database\get_book;
 use function Book_Database\get_books_admin_page_url;
@@ -65,4 +66,4 @@ protected function _get_dataset() {
 		return $book_link;
 
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/datasets/class-terms-breakdown.php b/src/Analytics/Datasets/Terms_Breakdown.php
similarity index 90%
rename from includes/analytics/datasets/class-terms-breakdown.php
rename to src/Analytics/Datasets/Terms_Breakdown.php
index bb4db468..b0490e95 100644
--- a/includes/analytics/datasets/class-terms-breakdown.php
+++ b/src/Analytics/Datasets/Terms_Breakdown.php
@@ -3,13 +3,14 @@
  * class-terms-breakdown.php
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
-namespace Book_Database\Analytics;
+namespace Book_Database\Analytics\Datasets;
 
-use Book_Database\Rating;
+use Book_Database\Analytics\Dataset;
+use Book_Database\ValueObjects\Rating;
 use function Book_Database\book_database;
 
 /**
@@ -59,4 +60,4 @@ protected function _get_dataset() {
 		return $results;
 
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/graphs/class-graph.php b/src/Analytics/Graph.php
similarity index 99%
rename from includes/analytics/graphs/class-graph.php
rename to src/Analytics/Graph.php
index 742e1ed4..1a630e2b 100644
--- a/includes/analytics/graphs/class-graph.php
+++ b/src/Analytics/Graph.php
@@ -3,7 +3,7 @@
  * Graph
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
@@ -240,4 +240,4 @@ public function get_args() {
 		return $this->args;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/analytics/graphs/class-horizontal-bar-graph.php b/src/Analytics/Horizontal_Bar_Graph.php
similarity index 100%
rename from includes/analytics/graphs/class-horizontal-bar-graph.php
rename to src/Analytics/Horizontal_Bar_Graph.php
diff --git a/includes/analytics/graphs/class-pie-chart.php b/src/Analytics/Pie_Chart.php
similarity index 100%
rename from includes/analytics/graphs/class-pie-chart.php
rename to src/Analytics/Pie_Chart.php
diff --git a/includes/analytics/graphs/class-scatter-chart.php b/src/Analytics/Scatter_Chart.php
similarity index 100%
rename from includes/analytics/graphs/class-scatter-chart.php
rename to src/Analytics/Scatter_Chart.php
diff --git a/includes/class-book-grid-query.php b/src/Book_Grid_Query.php
similarity index 97%
rename from includes/class-book-grid-query.php
rename to src/Book_Grid_Query.php
index b40fad31..02cd7d9d 100644
--- a/includes/class-book-grid-query.php
+++ b/src/Book_Grid_Query.php
@@ -5,14 +5,17 @@
  * Used in the `[book-grid]` shortcode.
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
 namespace Book_Database;
 
+use Book_Database\Database\Books\BooksQuery;
+
 /**
  * Class Book_Grid_Query
+ *
  * @package Book_Database
  */
 class Book_Grid_Query extends Book_Reviews_Query {
@@ -166,7 +169,7 @@ protected function parse_args( $atts = array() ) {
 	 */
 	public function get_results() {
 
-		$query   = new Books_Query();
+		$query   = new BooksQuery();
 		$results = $query->get_books( $this->args );
 
 		$count_args          = $this->args;
diff --git a/includes/books/class-book-layout.php b/src/Book_Layout.php
similarity index 96%
rename from includes/books/class-book-layout.php
rename to src/Book_Layout.php
index fa9c28ea..2803b72d 100644
--- a/includes/books/class-book-layout.php
+++ b/src/Book_Layout.php
@@ -3,14 +3,22 @@
  * Book Layout
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
 namespace Book_Database;
 
+use Book_Database\Models\Book;
+use Book_Database\Models\BookLink;
+use Book_Database\Models\BookTaxonomy;
+use Book_Database\Models\Edition;
+use Book_Database\Models\Series;
+use Book_Database\ValueObjects\Rating;
+
 /**
  * Class Book_Layout
+ *
  * @package Book_Database
  */
 class Book_Layout {
@@ -144,7 +152,7 @@ public function get_field_value( $field ) {
 		} else {
 			// Route all taxonomies not covered to `get_field_taxonomy`.
 			$taxonomy = get_book_taxonomy_by( 'slug', $field );
-			if ( $taxonomy instanceof Book_Taxonomy ) {
+			if ( $taxonomy instanceof BookTaxonomy ) {
 				$value = call_user_func( array( $this, 'get_field_taxonomy' ), $taxonomy );
 			}
 		}
@@ -297,7 +305,7 @@ public function get_field_buy_link() {
 		 * Filters the buy link separator.
 		 *
 		 * @param string      $link_separator Separator string between links.
-		 * @param Book_Link[] $links          Array of Book_Link objects.
+		 * @param BookLink[] $links          Array of Book_Link objects.
 		 * @param Book        $book           Book object.
 		 * @param Book_Layout $this           Book layout object.
 		 *
@@ -355,7 +363,7 @@ public function get_field_synopsis() {
 	 *
 	 * This covers the `source` taxonomy and all custom taxonomies.
 	 *
-	 * @param Book_Taxonomy $taxonomy
+	 * @param BookTaxonomy $taxonomy
 	 *
 	 * @return string
 	 */
@@ -462,4 +470,4 @@ public function get_schema_markup() {
 		return ob_get_clean();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/class-book-reviews-query.php b/src/Book_Reviews_Query.php
similarity index 97%
rename from includes/class-book-reviews-query.php
rename to src/Book_Reviews_Query.php
index d4962026..8f02d047 100644
--- a/includes/class-book-reviews-query.php
+++ b/src/Book_Reviews_Query.php
@@ -5,14 +5,17 @@
  * Used in the `[book-reviews]` shortcode.
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
 namespace Book_Database;
 
+use Book_Database\Database\Reviews\ReviewsQuery;
+
 /**
  * Class Book_Reviews_Query
+ *
  * @package Book_Database
  */
 class Book_Reviews_Query {
@@ -207,7 +210,7 @@ protected function parse_args( $args = array() ) {
 	 */
 	public function get_results() {
 
-		$query   = new Reviews_Query();
+		$query   = new ReviewsQuery();
 		$reviews = $query->get_reviews( $this->args );
 
 		$count_args          = $this->args;
@@ -234,4 +237,4 @@ public function get_pagination() {
 		) );
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/class-cli.php b/src/CLI.php
similarity index 96%
rename from includes/class-cli.php
rename to src/CLI.php
index 7d518cfd..474ed6af 100644
--- a/includes/class-cli.php
+++ b/src/CLI.php
@@ -3,7 +3,7 @@
  * WP-CLI
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
@@ -13,9 +13,13 @@
 	return;
 }
 
+use Book_Database\Exceptions\Exception;
+use Book_Database\Models\Author;
+use Book_Database\Models\Retailer;
+use Book_Database\Models\Review;
 use WP_CLI;
 
-WP_CLI::add_command( 'bdb', '\Book_Database\CLI' );
+WP_CLI::add_command( 'bdb', '\\Book_Database\\CLI' );
 
 class CLI extends \WP_CLI_Command {
 
diff --git a/src/Container/Container.php b/src/Container/Container.php
new file mode 100644
index 00000000..8a9a86f5
--- /dev/null
+++ b/src/Container/Container.php
@@ -0,0 +1,1242 @@
+<?php
+/**
+ * Container.php
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ * @since     1.3
+ */
+
+namespace Book_Database\Container;
+
+use ArrayAccess;
+use Closure;
+use Exception;
+use Book_Database\Container\Exceptions\BindingResolutionException;
+use InvalidArgumentException;
+use LogicException;
+use ReflectionClass;
+use ReflectionException;
+use ReflectionParameter;
+
+class Container implements ArrayAccess
+{
+
+    /**
+     * An array of the types that have been resolved.
+     *
+     * @var bool[]
+     */
+    protected $resolved = [];
+
+    /**
+     * The container's bindings.
+     *
+     * @var array[]
+     */
+    protected $bindings = [];
+
+    /**
+     * The container's method bindings.
+     *
+     * @var Closure[]
+     */
+    protected $methodBindings = [];
+
+    /**
+     * The container's shared instances.
+     *
+     * @var object[]
+     */
+    protected $instances = [];
+
+    /**
+     * The registered type aliases.
+     *
+     * @var string[]
+     */
+    protected $aliases = [];
+
+    /**
+     * The registered aliases keyed by the abstract name.
+     *
+     * @var array[]
+     */
+    protected $abstractAliases = [];
+
+    /**
+     * The extension closures for services.
+     *
+     * @var array[]
+     */
+    protected $extenders = [];
+
+    /**
+     * All of the registered tags.
+     *
+     * @var array[]
+     */
+    protected $tags = [];
+
+    /**
+     * The stack of concretions currently being built.
+     *
+     * @var array[]
+     */
+    protected $buildStack = [];
+
+    /**
+     * The parameter override stack.
+     *
+     * @var array[]
+     */
+    protected $with = [];
+
+    /**
+     * All of the registered rebound callbacks.
+     *
+     * @var array[]
+     */
+    protected $reboundCallbacks = [];
+
+    /**
+     * All of the global resolving callbacks.
+     *
+     * @var Closure[]
+     */
+    protected $globalResolvingCallbacks = [];
+
+    /**
+     * All of the global after resolving callbacks.
+     *
+     * @var Closure[]
+     */
+    protected $globalAfterResolvingCallbacks = [];
+
+    /**
+     * All of the resolving callbacks by class type.
+     *
+     * @var array[]
+     */
+    protected $resolvingCallbacks = [];
+
+    /**
+     * All of the after resolving callbacks by class type.
+     *
+     * @var array[]
+     */
+    protected $afterResolvingCallbacks = [];
+
+    /**
+     * Determine if the given abstract type has been bound.
+     *
+     * @param  string  $abstract
+     *
+     * @return bool
+     */
+    public function bound($abstract)
+    {
+        return isset($this->bindings[$abstract]) ||
+            isset($this->instances[$abstract]) ||
+            $this->isAlias($abstract);
+    }
+
+    /**
+     * Returns true if the container can return an entry for the given identifier.
+     * Returns false otherwise.
+     *
+     * `has($id)` returning true does not mean that `get($id)` will not throw an exception.
+     * It does however mean that `get($id)` will not throw a `NotFoundExceptionInterface`.
+     *
+     * @param  string  $id  Identifier of the entry to look for.
+     *
+     * @return bool
+     */
+    public function has($id)
+    {
+        return $this->bound($id);
+    }
+
+    /**
+     * Determine if the given abstract type has been resolved.
+     *
+     * @param  string  $abstract
+     *
+     * @return bool
+     */
+    public function resolved($abstract)
+    {
+        if ($this->isAlias($abstract)) {
+            $abstract = $this->getAlias($abstract);
+        }
+
+        return isset($this->resolved[$abstract]) ||
+            isset($this->instances[$abstract]);
+    }
+
+    /**
+     * Determine if a given type is shared.
+     *
+     * @param  string  $abstract
+     *
+     * @return bool
+     */
+    public function isShared($abstract)
+    {
+        return isset($this->instances[$abstract]) ||
+            (isset($this->bindings[$abstract]['shared']) &&
+                $this->bindings[$abstract]['shared'] === true);
+    }
+
+    /**
+     * Determine if a given string is an alias.
+     *
+     * @param  string  $name
+     *
+     * @return bool
+     */
+    public function isAlias($name)
+    {
+        return isset($this->aliases[$name]);
+    }
+
+    /**
+     * Register a binding with the container.
+     *
+     * @param  string  $abstract
+     * @param  Closure|string|null  $concrete
+     * @param  bool  $shared
+     *
+     * @return void
+     */
+    public function bind($abstract, $concrete = null, $shared = false)
+    {
+        $this->dropStaleInstances($abstract);
+
+        // If no concrete type was given, we will simply set the concrete type to the
+        // abstract type. After that, the concrete type to be registered as shared
+        // without being forced to state their classes in both of the parameters.
+        if (is_null($concrete)) {
+            $concrete = $abstract;
+        }
+
+        // If the factory is not a Closure, it means it is just a class name which is
+        // bound into this container to the abstract type and we will just wrap it
+        // up inside its own Closure to give us more convenience when extending.
+        if (! $concrete instanceof Closure) {
+            $concrete = $this->getClosure($abstract, $concrete);
+        }
+
+        $this->bindings[$abstract] = compact('concrete', 'shared');
+
+        // If the abstract type was already resolved in this container we'll fire the
+        // rebound listener so that any objects which have already gotten resolved
+        // can have their copy of the object updated via the listener callbacks.
+        if ($this->resolved($abstract)) {
+            $this->rebound($abstract);
+        }
+    }
+
+    /**
+     * Get the Closure to be used when building a type.
+     *
+     * @param  string  $abstract
+     * @param  string  $concrete
+     *
+     * @return Closure
+     */
+    protected function getClosure($abstract, $concrete)
+    {
+        return function ($container, $parameters = []) use ($abstract, $concrete) {
+            if ($abstract == $concrete) {
+                return $container->build($concrete);
+            }
+
+            return $container->resolve(
+                $concrete,
+                $parameters,
+                $raiseEvents = false
+            );
+        };
+    }
+
+    /**
+     * Determine if the container has a method binding.
+     *
+     * @param  string  $method
+     *
+     * @return bool
+     */
+    public function hasMethodBinding($method)
+    {
+        return isset($this->methodBindings[$method]);
+    }
+
+    /**
+     * Bind a callback to resolve with Container::call.
+     *
+     * @param  array|string  $method
+     * @param  Closure  $callback
+     *
+     * @return void
+     */
+    public function bindMethod($method, $callback)
+    {
+        $this->methodBindings[$this->parseBindMethod($method)] = $callback;
+    }
+
+    /**
+     * Get the method to be bound in class@method format.
+     *
+     * @param  array|string  $method
+     *
+     * @return string
+     */
+    protected function parseBindMethod($method)
+    {
+        if (is_array($method)) {
+            return $method[0].'@'.$method[1];
+        }
+
+        return $method;
+    }
+
+    /**
+     * Get the method binding for the given method.
+     *
+     * @param  string  $method
+     * @param  mixed  $instance
+     *
+     * @return mixed
+     */
+    public function callMethodBinding($method, $instance)
+    {
+        return call_user_func($this->methodBindings[$method], $instance, $this);
+    }
+
+    /**
+     * Register a binding if it hasn't already been registered.
+     *
+     * @param  string  $abstract
+     * @param  Closure|string|null  $concrete
+     * @param  bool  $shared
+     *
+     * @return void
+     */
+    public function bindIf($abstract, $concrete = null, $shared = false)
+    {
+        if (! $this->bound($abstract)) {
+            $this->bind($abstract, $concrete, $shared);
+        }
+    }
+
+    /**
+     * Register a shared binding in the container.
+     *
+     * @param  string  $abstract
+     * @param  Closure|string|null  $concrete
+     *
+     * @return void
+     */
+    public function singleton($abstract, $concrete = null)
+    {
+        $this->bind($abstract, $concrete, true);
+    }
+
+    /**
+     * Register a shared binding if it hasn't already been registered.
+     *
+     * @param  string  $abstract
+     * @param  Closure|string|null  $concrete
+     *
+     * @return void
+     */
+    public function singletonIf($abstract, $concrete = null)
+    {
+        if (! $this->bound($abstract)) {
+            $this->singleton($abstract, $concrete);
+        }
+    }
+
+    /**
+     * "Extend" an abstract type in the container.
+     *
+     * @param  string  $abstract
+     * @param  Closure  $closure
+     *
+     * @return void
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function extend($abstract, Closure $closure)
+    {
+        $abstract = $this->getAlias($abstract);
+
+        if (isset($this->instances[$abstract])) {
+            $this->instances[$abstract] = $closure($this->instances[$abstract], $this);
+
+            $this->rebound($abstract);
+        } else {
+            $this->extenders[$abstract][] = $closure;
+
+            if ($this->resolved($abstract)) {
+                $this->rebound($abstract);
+            }
+        }
+    }
+
+    /**
+     * Register an existing instance as shared in the container.
+     *
+     * @param  string  $abstract
+     * @param  mixed  $instance
+     *
+     * @return mixed
+     */
+    public function instance($abstract, $instance)
+    {
+        $this->removeAbstractAlias($abstract);
+
+        $isBound = $this->bound($abstract);
+
+        unset($this->aliases[$abstract]);
+
+        // We'll check to determine if this type has been bound before, and if it has
+        // we will fire the rebound callbacks registered with the container and it
+        // can be updated with consuming classes that have gotten resolved here.
+        $this->instances[$abstract] = $instance;
+
+        if ($isBound) {
+            $this->rebound($abstract);
+        }
+
+        return $instance;
+    }
+
+    /**
+     * Remove an alias from the contextual binding alias cache.
+     *
+     * @param  string  $searched
+     *
+     * @return void
+     */
+    protected function removeAbstractAlias($searched)
+    {
+        if (! isset($this->aliases[$searched])) {
+            return;
+        }
+
+        foreach ($this->abstractAliases as $abstract => $aliases) {
+            foreach ($aliases as $index => $alias) {
+                if ($alias == $searched) {
+                    unset($this->abstractAliases[$abstract][$index]);
+                }
+            }
+        }
+    }
+
+    /**
+     * Assign a set of tags to a given binding.
+     *
+     * @param  array|string  $abstracts
+     * @param  array|mixed  ...$tags
+     *
+     * @return void
+     */
+    public function tag($abstracts, $tags)
+    {
+        $tags = is_array($tags) ? $tags : array_slice(func_get_args(), 1);
+
+        foreach ($tags as $tag) {
+            if (! isset($this->tags[$tag])) {
+                $this->tags[$tag] = [];
+            }
+
+            foreach ((array) $abstracts as $abstract) {
+                $this->tags[$tag][] = $abstract;
+            }
+        }
+    }
+
+    /**
+     * Alias a type to a different name.
+     *
+     * @param  string  $abstract
+     * @param  string  $alias
+     *
+     * @return void
+     *
+     * @throws LogicException
+     */
+    public function alias($abstract, $alias)
+    {
+        if ($alias === $abstract) {
+            throw new LogicException("[{$abstract}] is aliased to itself.");
+        }
+
+        $this->aliases[$alias] = $abstract;
+
+        $this->abstractAliases[$abstract][] = $alias;
+    }
+
+    /**
+     * Bind a new callback to an abstract's rebind event.
+     *
+     * @param  string  $abstract
+     * @param  Closure  $callback
+     *
+     * @return mixed
+     */
+    public function rebinding($abstract, Closure $callback)
+    {
+        $this->reboundCallbacks[$abstract = $this->getAlias($abstract)][] = $callback;
+
+        if ($this->bound($abstract)) {
+            return $this->make($abstract);
+        }
+
+        return null;
+    }
+
+    /**
+     * Refresh an instance on the given target and method.
+     *
+     * @param  string  $abstract
+     * @param  mixed  $target
+     * @param  string  $method
+     *
+     * @return mixed
+     */
+    public function refresh($abstract, $target, $method)
+    {
+        return $this->rebinding(
+            $abstract,
+            function ($app, $instance) use ($target, $method) {
+                $target->{$method}($instance);
+            }
+        );
+    }
+
+    /**
+     * Fire the "rebound" callbacks for the given abstract type.
+     *
+     * @param  string  $abstract
+     *
+     * @return void
+     */
+    protected function rebound($abstract)
+    {
+        $instance = $this->make($abstract);
+
+        foreach ($this->getReboundCallbacks($abstract) as $callback) {
+            $callback($this, $instance);
+        }
+    }
+
+    /**
+     * Get the rebound callbacks for a given type.
+     *
+     * @param  string  $abstract
+     *
+     * @return array
+     */
+    protected function getReboundCallbacks($abstract)
+    {
+        return isset($this->reboundCallbacks[$abstract]) ? $this->reboundCallbacks[$abstract] : [];
+    }
+
+    /**
+     * Get a closure to resolve the given type from the container.
+     *
+     * @param  string  $abstract
+     *
+     * @return Closure
+     */
+    public function factory($abstract)
+    {
+        return function () use ($abstract) {
+            return $this->make($abstract);
+        };
+    }
+
+    /**
+     * Resolve the given type from the container.
+     *
+     * @param  string  $abstract
+     * @param  array  $parameters
+     *
+     * @return mixed
+     * @throws BindingResolutionException
+     */
+    public function make($abstract, array $parameters = [])
+    {
+        return $this->resolve($abstract, $parameters);
+    }
+
+    /**
+     * Finds an entry of the container by its identifier and returns it.
+     *
+     * @param  string  $id  Identifier of the entry to look for.
+     *
+     * @return mixed Entry.
+     * @throws InvalidArgumentException|BindingResolutionException
+     */
+    public function get($id)
+    {
+        try {
+            return $this->resolve($id);
+        } catch (Exception $e) {
+            if ($this->has($id)) {
+                throw $e;
+            }
+
+            throw new InvalidArgumentException($id, $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * Resolve the given type from the container.
+     *
+     * @param  string  $abstract
+     * @param  array  $parameters
+     * @param  bool  $raiseEvents
+     *
+     * @return mixed
+     * @throws BindingResolutionException
+     * @throws ReflectionException
+     */
+    protected function resolve($abstract, $parameters = [], $raiseEvents = true)
+    {
+        $abstract = $this->getAlias($abstract);
+
+        $concrete = null;
+
+        // If an instance of the type is currently being managed as a singleton we'll
+        // just return an existing instance instead of instantiating new instances
+        // so the developer can keep using the same objects instance every time.
+        if (isset($this->instances[$abstract])) {
+            return $this->instances[$abstract];
+        }
+
+        $this->with[] = $parameters;
+
+        if (is_null($concrete)) {
+            $concrete = $this->getConcrete($abstract);
+        }
+
+        // We're ready to instantiate an instance of the concrete type registered for
+        // the binding. This will instantiate the types, as well as resolve any of
+        // its "nested" dependencies recursively until all have gotten resolved.
+        if ($this->isBuildable($concrete, $abstract)) {
+            $object = $this->build($concrete);
+        } else {
+            $object = $this->make($concrete);
+        }
+
+        // If we defined any extenders for this type, we'll need to spin through them
+        // and apply them to the object being built. This allows for the extension
+        // of services, such as changing configuration or decorating the object.
+        foreach ($this->getExtenders($abstract) as $extender) {
+            $object = $extender($object, $this);
+        }
+
+        // If the requested type is registered as a singleton we'll want to cache off
+        // the instances in "memory" so we can return it later without creating an
+        // entirely new instance of an object on each subsequent request for it.
+        if ($this->isShared($abstract)) {
+            $this->instances[$abstract] = $object;
+        }
+
+        if ($raiseEvents) {
+            $this->fireResolvingCallbacks($abstract, $object);
+        }
+
+        // Before returning, we will also set the resolved flag to "true" and pop off
+        // the parameter overrides for this build. After those two things are done
+        // we will be ready to return back the fully constructed class instance.
+        $this->resolved[$abstract] = true;
+
+        array_pop($this->with);
+
+        return $object;
+    }
+
+    /**
+     * Get the concrete type for a given abstract.
+     *
+     * @param  string  $abstract
+     *
+     * @return mixed
+     */
+    protected function getConcrete($abstract)
+    {
+        // If we don't have a registered resolver or concrete for the type, we'll just
+        // assume each type is a concrete name and will attempt to resolve it as is
+        // since the container should be able to resolve concretes automatically.
+        if (isset($this->bindings[$abstract])) {
+            return $this->bindings[$abstract]['concrete'];
+        }
+
+        return $abstract;
+    }
+
+    /**
+     * Determine if the given concrete is buildable.
+     *
+     * @param  mixed  $concrete
+     * @param  string  $abstract
+     *
+     * @return bool
+     */
+    protected function isBuildable($concrete, $abstract)
+    {
+        return $concrete === $abstract || $concrete instanceof Closure;
+    }
+
+    /**
+     * Instantiate a concrete instance of the given type.
+     *
+     * @param  Closure|string  $concrete
+     *
+     * @return mixed
+     * @throws BindingResolutionException
+     * @throws ReflectionException
+     */
+    public function build($concrete)
+    {
+        // If the concrete type is actually a Closure, we will just execute it and
+        // hand back the results of the functions, which allows functions to be
+        // used as resolvers for more fine-tuned resolution of these objects.
+        if ($concrete instanceof Closure) {
+            return $concrete($this, $this->getLastParameterOverride());
+        }
+
+        try {
+            $reflector = new ReflectionClass($concrete);
+        } catch (ReflectionException $e) {
+            throw new InvalidArgumentException("Target class [$concrete] does not exist.", 0, $e);
+        }
+
+        // If the type is not instantiable, the developer is attempting to resolve
+        // an abstract type such as an Interface or Abstract Class and there is
+        // no binding registered for the abstractions so we need to bail out.
+        if (! $reflector->isInstantiable()) {
+            $this->notInstantiable($concrete);
+        }
+
+        $this->buildStack[] = $concrete;
+
+        $constructor = $reflector->getConstructor();
+
+        // If there are no constructors, that means there are no dependencies then
+        // we can just resolve the instances of the objects right away, without
+        // resolving any other types or dependencies out of these containers.
+        if (is_null($constructor)) {
+            array_pop($this->buildStack);
+
+            return new $concrete;
+        }
+
+        $dependencies = $constructor->getParameters();
+
+        // Once we have all the constructor's parameters we can create each of the
+        // dependency instances and then use the reflection instances to make a
+        // new instance of this class, injecting the created dependencies in.
+        try {
+            $instances = $this->resolveDependencies($dependencies);
+        } catch (BindingResolutionException $e) {
+            array_pop($this->buildStack);
+
+            throw $e;
+        }
+
+        array_pop($this->buildStack);
+
+        return $reflector->newInstanceArgs($instances);
+    }
+
+    /**
+     * Resolve all of the dependencies from the ReflectionParameters.
+     *
+     * @param  array  $dependencies
+     *
+     * @return array
+     * @throws BindingResolutionException
+     * @throws ReflectionException
+     */
+    protected function resolveDependencies(array $dependencies)
+    {
+        $results = [];
+
+        foreach ($dependencies as $dependency) {
+            // If this dependency has a override for this particular build we will use
+            // that instead as the value. Otherwise, we will continue with this run
+            // of resolutions and let reflection attempt to determine the result.
+            if ($this->hasParameterOverride($dependency)) {
+                $results[] = $this->getParameterOverride($dependency);
+
+                continue;
+            }
+
+
+            // @note: ReflectionParameter::getClass() is deprecated since PHP 8
+            // @note: ReflectionParameter::getType() is not supported before PHP7
+            $name = version_compare(PHP_VERSION, '8.0', '<')
+                ? $dependency->getClass()
+                : $dependency->getType()->getName();
+
+            // If the class is null, it means the dependency is a string or some other
+            // primitive type which we can not resolve since it is not a class and
+            // we will just bomb out with an error since we have no-where to go.
+            $result = is_null($name)
+                ? $this->resolvePrimitive($dependency)
+                : $this->resolveClass($dependency);
+
+            if ($dependency->isVariadic()) {
+                array_push($results, ...$result);
+            } else {
+                $results[] = $result;
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * Determine if the given dependency has a parameter override.
+     *
+     * @param  ReflectionParameter  $dependency
+     *
+     * @return bool
+     */
+    protected function hasParameterOverride($dependency)
+    {
+        return array_key_exists(
+            $dependency->name,
+            $this->getLastParameterOverride()
+        );
+    }
+
+    /**
+     * Get a parameter override for a dependency.
+     *
+     * @param  ReflectionParameter  $dependency
+     *
+     * @return mixed
+     */
+    protected function getParameterOverride($dependency)
+    {
+        return $this->getLastParameterOverride()[$dependency->name];
+    }
+
+    /**
+     * Get the last parameter override.
+     *
+     * @return array
+     */
+    protected function getLastParameterOverride()
+    {
+        return count($this->with) ? end($this->with) : [];
+    }
+
+    /**
+     * Resolve a non-class hinted primitive dependency.
+     *
+     * @param  ReflectionParameter  $parameter
+     *
+     * @return mixed
+     * @throws BindingResolutionException
+     */
+    protected function resolvePrimitive(ReflectionParameter $parameter)
+    {
+        if ($parameter->isDefaultValueAvailable()) {
+            return $parameter->getDefaultValue();
+        }
+
+        $this->unresolvablePrimitive($parameter);
+
+        return null;
+    }
+
+    /**
+     * Resolve a class based dependency from the container.
+     *
+     * @param  ReflectionParameter  $parameter
+     *
+     * @return mixed
+     * @throws BindingResolutionException
+     * @throws ReflectionException
+     */
+    protected function resolveClass(ReflectionParameter $parameter)
+    {
+        try {
+            // @note: ReflectionParameter::getClass() is deprecated since PHP 8
+            // @note: ReflectionParameter::getType() is not supported before PHP7
+            return version_compare(PHP_VERSION, '8.0', '<')
+                ? $this->make($parameter->getClass()->name)
+                : $this->make($parameter->getType()->getName());
+        }
+
+            // If we can not resolve the class instance, we will check to see if the value
+            // is optional, and if it is we will return the optional parameter value as
+            // the value of the dependency, similarly to how we do this with scalars.
+        catch (BindingResolutionException $e) {
+            if ($parameter->isDefaultValueAvailable()) {
+                return $parameter->getDefaultValue();
+            }
+
+            if ($parameter->isVariadic()) {
+                return [];
+            }
+
+            throw $e;
+        }
+    }
+
+    /**
+     * Throw an exception that the concrete is not instantiable.
+     *
+     * @param  string  $concrete
+     *
+     * @return void
+     * @throws BindingResolutionException
+     */
+    protected function notInstantiable($concrete)
+    {
+        if (! empty($this->buildStack)) {
+            $previous = implode(', ', $this->buildStack);
+
+            $message = "Target [$concrete] is not instantiable while building [$previous].";
+        } else {
+            $message = "Target [$concrete] is not instantiable.";
+        }
+
+        throw new BindingResolutionException($message);
+    }
+
+    /**
+     * Throw an exception for an unresolvable primitive.
+     *
+     * @param  ReflectionParameter  $parameter
+     *
+     * @return void
+     * @throws BindingResolutionException
+     */
+    protected function unresolvablePrimitive(ReflectionParameter $parameter)
+    {
+        $message = "Unresolvable dependency resolving [$parameter] in class {$parameter->getDeclaringClass()->getName()}";
+
+        throw new BindingResolutionException($message);
+    }
+
+    /**
+     * Register a new resolving callback.
+     *
+     * @param  Closure|string  $abstract
+     * @param  Closure|null  $callback
+     *
+     * @return void
+     */
+    public function resolving($abstract, Closure $callback = null)
+    {
+        if (is_string($abstract)) {
+            $abstract = $this->getAlias($abstract);
+        }
+
+        if (is_null($callback) && $abstract instanceof Closure) {
+            $this->globalResolvingCallbacks[] = $abstract;
+        } else {
+            $this->resolvingCallbacks[$abstract][] = $callback;
+        }
+    }
+
+    /**
+     * Register a new after resolving callback for all types.
+     *
+     * @param  Closure|string  $abstract
+     * @param  Closure|null  $callback
+     *
+     * @return void
+     */
+    public function afterResolving($abstract, Closure $callback = null)
+    {
+        if (is_string($abstract)) {
+            $abstract = $this->getAlias($abstract);
+        }
+
+        if ($abstract instanceof Closure && is_null($callback)) {
+            $this->globalAfterResolvingCallbacks[] = $abstract;
+        } else {
+            $this->afterResolvingCallbacks[$abstract][] = $callback;
+        }
+    }
+
+    /**
+     * Fire all of the resolving callbacks.
+     *
+     * @param  string  $abstract
+     * @param  mixed  $object
+     *
+     * @return void
+     */
+    protected function fireResolvingCallbacks($abstract, $object)
+    {
+        $this->fireCallbackArray($object, $this->globalResolvingCallbacks);
+
+        $this->fireCallbackArray(
+            $object,
+            $this->getCallbacksForType($abstract, $object, $this->resolvingCallbacks)
+        );
+
+        $this->fireAfterResolvingCallbacks($abstract, $object);
+    }
+
+    /**
+     * Fire all of the after resolving callbacks.
+     *
+     * @param  string  $abstract
+     * @param  mixed  $object
+     *
+     * @return void
+     */
+    protected function fireAfterResolvingCallbacks($abstract, $object)
+    {
+        $this->fireCallbackArray($object, $this->globalAfterResolvingCallbacks);
+
+        $this->fireCallbackArray(
+            $object,
+            $this->getCallbacksForType($abstract, $object, $this->afterResolvingCallbacks)
+        );
+    }
+
+    /**
+     * Get all callbacks for a given type.
+     *
+     * @param  string  $abstract
+     * @param  object  $object
+     * @param  array  $callbacksPerType
+     *
+     * @return array
+     */
+    protected function getCallbacksForType($abstract, $object, array $callbacksPerType)
+    {
+        $results = [];
+
+        foreach ($callbacksPerType as $type => $callbacks) {
+            if ($type === $abstract || $object instanceof $type) {
+                array_push($results, ...$callbacks);
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * Fire an array of callbacks with an object.
+     *
+     * @param  mixed  $object
+     * @param  array  $callbacks
+     *
+     * @return void
+     */
+    protected function fireCallbackArray($object, array $callbacks)
+    {
+        foreach ($callbacks as $callback) {
+            $callback($object, $this);
+        }
+    }
+
+    /**
+     * Get the container's bindings.
+     *
+     * @return array
+     */
+    public function getBindings()
+    {
+        return $this->bindings;
+    }
+
+    /**
+     * Get the alias for an abstract if available.
+     *
+     * @param  string  $abstract
+     *
+     * @return string
+     */
+    public function getAlias($abstract)
+    {
+        if (! isset($this->aliases[$abstract])) {
+            return $abstract;
+        }
+
+        return $this->getAlias($this->aliases[$abstract]);
+    }
+
+    /**
+     * Get the extender callbacks for a given type.
+     *
+     * @param  string  $abstract
+     *
+     * @return array
+     */
+    protected function getExtenders($abstract)
+    {
+        $abstract = $this->getAlias($abstract);
+
+        return isset($this->extenders[$abstract]) ? $this->extenders[$abstract] : [];
+    }
+
+    /**
+     * Remove all of the extender callbacks for a given type.
+     *
+     * @param  string  $abstract
+     *
+     * @return void
+     */
+    public function forgetExtenders($abstract)
+    {
+        unset($this->extenders[$this->getAlias($abstract)]);
+    }
+
+    /**
+     * Drop all of the stale instances and aliases.
+     *
+     * @param  string  $abstract
+     *
+     * @return void
+     */
+    protected function dropStaleInstances($abstract)
+    {
+        unset($this->instances[$abstract], $this->aliases[$abstract]);
+    }
+
+    /**
+     * Remove a resolved instance from the instance cache.
+     *
+     * @param  string  $abstract
+     *
+     * @return void
+     */
+    public function forgetInstance($abstract)
+    {
+        unset($this->instances[$abstract]);
+    }
+
+    /**
+     * Clear all of the instances from the container.
+     *
+     * @return void
+     */
+    public function forgetInstances()
+    {
+        $this->instances = [];
+    }
+
+    /**
+     * Flush the container of all bindings and resolved instances.
+     *
+     * @return void
+     */
+    public function flush()
+    {
+        $this->aliases         = [];
+        $this->resolved        = [];
+        $this->bindings        = [];
+        $this->instances       = [];
+        $this->abstractAliases = [];
+    }
+
+    /**
+     * Determine if a given offset exists.
+     *
+     * @param  string  $key
+     *
+     * @return bool
+     */
+    public function offsetExists($key)
+    {
+        return $this->bound($key);
+    }
+
+    /**
+     * Get the value at a given offset.
+     *
+     * @param  string  $key
+     *
+     * @return mixed
+     * @throws BindingResolutionException
+     */
+    public function offsetGet($key)
+    {
+        return $this->make($key);
+    }
+
+    /**
+     * Set the value at a given offset.
+     *
+     * @param  string  $key
+     * @param  mixed  $value
+     *
+     * @return void
+     */
+    public function offsetSet($key, $value)
+    {
+        $this->bind(
+            $key,
+            $value instanceof Closure ? $value : function () use ($value) {
+                return $value;
+            }
+        );
+    }
+
+    /**
+     * Unset the value at a given offset.
+     *
+     * @param  string  $key
+     *
+     * @return void
+     */
+    public function offsetUnset($key)
+    {
+        unset($this->bindings[$key], $this->instances[$key], $this->resolved[$key]);
+    }
+
+    /**
+     * Dynamically access container services.
+     *
+     * @param  string  $key
+     *
+     * @return mixed
+     */
+    public function __get($key)
+    {
+        return $this[$key];
+    }
+
+    /**
+     * Dynamically set container services.
+     *
+     * @param  string  $key
+     * @param  mixed  $value
+     *
+     * @return void
+     */
+    public function __set($key, $value)
+    {
+        $this[$key] = $value;
+    }
+
+    /**
+     * Checks to see if the key exists.
+     *
+     * @param $key
+     *
+     * @return bool
+     */
+    public function __isset($key)
+    {
+        return isset($this[$key]);
+    }
+
+}
diff --git a/src/Container/Exceptions/BindingResolutionException.php b/src/Container/Exceptions/BindingResolutionException.php
new file mode 100644
index 00000000..d9063169
--- /dev/null
+++ b/src/Container/Exceptions/BindingResolutionException.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * BindingResolutionException.php
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ * @since     1.3
+ */
+
+namespace Book_Database\Container\Exceptions;
+
+class BindingResolutionException extends \Exception
+{
+
+}
diff --git a/src/Database/Authors/AuthorsQuery.php b/src/Database/Authors/AuthorsQuery.php
new file mode 100644
index 00000000..91db7bbc
--- /dev/null
+++ b/src/Database/Authors/AuthorsQuery.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Authors Query
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2019, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Authors;
+
+use Book_Database\Models\Author;
+use Book_Database\BerlinDB;
+
+/**
+ * Class AuthorsQuery
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class AuthorsQuery extends BerlinDB\Database\Query
+{
+
+    /**
+     * Name of the table to query
+     *
+     * @var string
+     */
+    protected $table_name = 'authors';
+
+    /**
+     * String used to alias the database table in MySQL statements
+     *
+     * @var string
+     */
+    protected $table_alias = 'author';
+
+    /**
+     * Name of class used to set up the database schema
+     *
+     * @var string
+     */
+    protected $table_schema = AuthorsSchema::class;
+
+    /**
+     * Name for a single item
+     *
+     * @var string
+     */
+    protected $item_name = 'author';
+
+    /**
+     * Plural version for a group of items
+     *
+     * @var string
+     */
+    protected $item_name_plural = 'authors';
+
+    /**
+     * Class name to turn IDs into these objects
+     *
+     * @var string
+     */
+    protected $item_shape = Author::class;
+
+    /**
+     * Group to cache queries and queried items to
+     *
+     * @var string
+     */
+    protected $cache_group = 'authors';
+
+    /**
+     * Query constructor.
+     *
+     * @param  array  $args
+     */
+    public function __construct($args = array())
+    {
+        parent::__construct($args);
+    }
+
+}
diff --git a/src/Database/Authors/AuthorsSchema.php b/src/Database/Authors/AuthorsSchema.php
new file mode 100644
index 00000000..58d73c7a
--- /dev/null
+++ b/src/Database/Authors/AuthorsSchema.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Authors Schema
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2019, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Authors;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class AuthorsSchema
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class AuthorsSchema extends BerlinDB\Database\Schema
+{
+
+    /**
+     * Array of database columns
+     *
+     * @var array
+     */
+    public $columns = array(
+
+        // id
+        array(
+            'name'     => 'id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'extra'    => 'auto_increment',
+            'primary'  => true,
+            'sortable' => true
+        ),
+
+        // name
+        array(
+            'name'       => 'name',
+            'type'       => 'varchar',
+            'length'     => '200',
+            'sortable'   => true,
+            'searchable' => true,
+            'validate'   => 'sanitize_text_field'
+        ),
+
+        // slug
+        array(
+            'name'     => 'slug',
+            'type'     => 'varchar',
+            'length'   => '200',
+            'sortable' => true,
+            'validate' => 'sanitize_key'
+        ),
+
+        // description
+        array(
+            'name'     => 'description',
+            'type'     => 'longtext',
+            'validate' => 'wp_kses_post'
+        ),
+
+        // image_id
+        array(
+            'name'       => 'image_id',
+            'type'       => 'bigint',
+            'length'     => '20',
+            'unsigned'   => true,
+            'sortable'   => true,
+            'allow_null' => true,
+            'default'    => null,
+            'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
+        ),
+
+        // links
+        array(
+            'name' => 'links',
+            'type' => 'longtext',
+        ),
+
+        // book_count
+        array(
+            'name'     => 'book_count',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'sortable' => true,
+            'default'  => 0
+        ),
+
+        // date_created
+        array(
+            'name'       => 'date_created',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'created'    => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+        // date_modified
+        array(
+            'name'       => 'date_modified',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'modified'   => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+    );
+
+}
diff --git a/src/Database/Authors/AuthorsTable.php b/src/Database/Authors/AuthorsTable.php
new file mode 100644
index 00000000..b56845bb
--- /dev/null
+++ b/src/Database/Authors/AuthorsTable.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Authors Table
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2019, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Authors;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class Authors_Table
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class AuthorsTable extends BerlinDB\Database\Table
+{
+
+    /**
+     * @var string Table name
+     */
+    protected $name = 'authors';
+
+    /**
+     * @var int Database version in format {YYYY}{MM}{DD}{1}
+     */
+    protected $version = 201910131;
+
+    /**
+     * @var array Upgrades to perform
+     */
+    protected $upgrades = array();
+
+    /**
+     * Book_Taxonomies_Table constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Set up the database schema
+     */
+    protected function set_schema()
+    {
+        $this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+			name varchar(200) NOT NULL DEFAULT '',
+			slug varchar(200) NOT NULL DEFAULT '',
+			description longtext NOT NULL DEFAULT '',
+			image_id bigint(20) UNSIGNED DEFAULT NULL,
+			links longtext NOT NULL DEFAULT '',
+			book_count bigint(20) UNSIGNED NOT NULL DEFAULT 0,
+			date_created datetime NOT NULL,
+			date_modified datetime NOT NULL,
+			INDEX name (name),
+			INDEX slug (slug)";
+    }
+
+}
diff --git a/src/Database/BookAuthor/BookAuthorQuery.php b/src/Database/BookAuthor/BookAuthorQuery.php
new file mode 100644
index 00000000..4145a3cf
--- /dev/null
+++ b/src/Database/BookAuthor/BookAuthorQuery.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Book Author Relationships Query
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2019, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\BookAuthor;
+
+use Book_Database\BerlinDB;
+use Book_Database\Models\BookAuthorRelationship;
+
+/**
+ * Class Book_Author_Relationships_Query
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookAuthorQuery extends BerlinDB\Database\Query
+{
+
+    /**
+     * Name of the table to query
+     *
+     * @var string
+     */
+    protected $table_name = 'book_author_relationships';
+
+    /**
+     * String used to alias the database table in MySQL statements
+     *
+     * @var string
+     */
+    protected $table_alias = 'ar';
+
+    /**
+     * Name of class used to set up the database schema
+     *
+     * @var string
+     */
+    protected $table_schema = BookAuthorSchema::class;
+
+    /**
+     * Name for a single item
+     *
+     * @var string
+     */
+    protected $item_name = 'book_author_relationship';
+
+    /**
+     * Plural version for a group of items
+     *
+     * @var string
+     */
+    protected $item_name_plural = 'book_author_relationships';
+
+    /**
+     * Class name to turn IDs into these objects
+     *
+     * @var string
+     */
+    protected $item_shape = BookAuthorRelationship::class;
+
+    /**
+     * Group to cache queries and queried items to
+     *
+     * @var string
+     */
+    protected $cache_group = 'book_author_relationships';
+
+    /**
+     * Query constructor.
+     *
+     * @param  array  $args
+     */
+    public function __construct($args = array())
+    {
+        parent::__construct($args);
+    }
+
+}
diff --git a/src/Database/BookAuthor/BookAuthorSchema.php b/src/Database/BookAuthor/BookAuthorSchema.php
new file mode 100644
index 00000000..285dec55
--- /dev/null
+++ b/src/Database/BookAuthor/BookAuthorSchema.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Book Author Relationships Schema
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2019, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\BookAuthor;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class BookAuthorSchema
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookAuthorSchema extends BerlinDB\Database\Schema
+{
+
+    /**
+     * Array of database columns
+     *
+     * @var array
+     */
+    public $columns = array(
+
+        // id
+        array(
+            'name'     => 'id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'extra'    => 'auto_increment',
+            'primary'  => true,
+            'sortable' => true
+        ),
+
+        // author_id
+        array(
+            'name'     => 'author_id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'sortable' => true
+        ),
+
+        // book_id
+        array(
+            'name'     => 'book_id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'sortable' => true
+        ),
+
+        // date_created
+        array(
+            'name'       => 'date_created',
+            'type'       => 'datetime',
+            'default'    => '',
+            'created'    => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+        // date_modified
+        array(
+            'name'       => 'date_modified',
+            'type'       => 'datetime',
+            'default'    => '',
+            'modified'   => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+    );
+
+}
diff --git a/src/Database/BookAuthor/BookAuthorTable.php b/src/Database/BookAuthor/BookAuthorTable.php
new file mode 100644
index 00000000..9c0d410e
--- /dev/null
+++ b/src/Database/BookAuthor/BookAuthorTable.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Book Author Relationships Table
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2019, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\BookAuthor;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class BookAuthorTable
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookAuthorTable extends BerlinDB\Database\Table
+{
+
+    /**
+     * @var string Table name
+     */
+    protected $name = 'book_author_relationships';
+
+    /**
+     * @var int Database version in format {YYYY}{MM}{DD}{1}
+     */
+    protected $version = 201910131;
+
+    /**
+     * @var array Upgrades to perform
+     */
+    protected $upgrades = array();
+
+    /**
+     * Book_Term_Relationships_Table constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Set up the database schema
+     */
+    protected function set_schema()
+    {
+        $this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+			author_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
+			book_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
+			date_created datetime NOT NULL,
+			date_modified datetime NOT NULL,
+			INDEX author_id (author_id),
+			INDEX book_id (book_id)";
+    }
+
+}
diff --git a/src/Database/BookLinks/BookLinksQuery.php b/src/Database/BookLinks/BookLinksQuery.php
new file mode 100644
index 00000000..9b2c70a8
--- /dev/null
+++ b/src/Database/BookLinks/BookLinksQuery.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Book Links Query
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\BookLinks;
+
+use Book_Database\BerlinDB;
+use Book_Database\Models\BookLink;
+
+/**
+ * Class BookLinksQuery
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookLinksQuery extends BerlinDB\Database\Query
+{
+
+    /**
+     * Name of the table to query
+     *
+     * @var string
+     */
+    protected $table_name = 'book_links';
+
+    /**
+     * String used to alias the database table in MySQL statements
+     *
+     * @var string
+     */
+    protected $table_alias = 'link';
+
+    /**
+     * Name of class used to set up the database schema
+     *
+     * @var string
+     */
+    protected $table_schema = BookLinksSchema::class;
+
+    /**
+     * Name for a single item
+     *
+     * @var string
+     */
+    protected $item_name = 'book_link';
+
+    /**
+     * Plural version for a group of items
+     *
+     * @var string
+     */
+    protected $item_name_plural = 'book_links';
+
+    /**
+     * Class name to turn IDs into these objects
+     *
+     * @var string
+     */
+    protected $item_shape = BookLink::class;
+
+    /**
+     * Group to cache queries and queried items to
+     *
+     * @var string
+     */
+    protected $cache_group = 'book_links';
+
+    /**
+     * Query constructor.
+     *
+     * @param  array  $args
+     */
+    public function __construct($args = array())
+    {
+        parent::__construct($args);
+    }
+
+}
diff --git a/src/Database/BookLinks/BookLinksSchema.php b/src/Database/BookLinks/BookLinksSchema.php
new file mode 100644
index 00000000..14e3dd82
--- /dev/null
+++ b/src/Database/BookLinks/BookLinksSchema.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Book Links Schema
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\BookLinks;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class BookLinksSchema
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookLinksSchema extends BerlinDB\Database\Schema
+{
+
+    /**
+     * Array of database columns
+     *
+     * @var array
+     */
+    public $columns = array(
+
+        // id
+        array(
+            'name'     => 'id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'extra'    => 'auto_increment',
+            'primary'  => true,
+            'sortable' => true
+        ),
+
+        // book_id
+        array(
+            'name'     => 'book_id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'sortable' => true,
+            'validate' => 'absint'
+        ),
+
+        // retailer_id
+        array(
+            'name'     => 'retailer_id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'sortable' => true,
+            'validate' => 'absint'
+        ),
+
+        // url
+        array(
+            'name'       => 'url',
+            'type'       => 'text',
+            'searchable' => true,
+            'validate'   => 'esc_url_raw'
+        ),
+
+        // date_created
+        array(
+            'name'       => 'date_created',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'created'    => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+        // date_modified
+        array(
+            'name'       => 'date_modified',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'modified'   => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+    );
+
+}
diff --git a/src/Database/BookLinks/BookLinksTable.php b/src/Database/BookLinks/BookLinksTable.php
new file mode 100644
index 00000000..36098b1b
--- /dev/null
+++ b/src/Database/BookLinks/BookLinksTable.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Book Links Table
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\BookLinks;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class BookLinksTable
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookLinksTable extends BerlinDB\Database\Table
+{
+
+    /**
+     * @var string Table name
+     */
+    protected $name = 'book_links';
+
+    /**
+     * @var int Database version in format {YYYY}{MM}{DD}{1}
+     */
+    protected $version = 201910311;
+
+    /**
+     * @var array Upgrades to perform
+     */
+    protected $upgrades = array();
+
+    /**
+     * Book_Taxonomies_Table constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Set up the database schema
+     */
+    protected function set_schema()
+    {
+        $this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+			book_id bigint(20) UNSIGNED NOT NULL,
+			retailer_id bigint(20) UNSIGNED NOT NULL,
+			url text NOT NULL DEFAULT '',
+			date_created datetime NOT NULL,
+			date_modified datetime NOT NULL,
+			INDEX book_id (book_id)";
+    }
+
+}
diff --git a/src/Database/BookTaxonomies/BookTaxonomiesQuery.php b/src/Database/BookTaxonomies/BookTaxonomiesQuery.php
new file mode 100644
index 00000000..33723b6c
--- /dev/null
+++ b/src/Database/BookTaxonomies/BookTaxonomiesQuery.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Book Taxonomies Query
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ * @since 1.3
+ */
+
+namespace Book_Database\Database\BookTaxonomies;
+
+use Book_Database\BerlinDB;
+use Book_Database\Models\BookTaxonomy;
+
+/**
+ * Class Book_Taxonomies_Query
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookTaxonomiesQuery extends BerlinDB\Database\Query
+{
+
+    /**
+     * Name of the table to query
+     *
+     * @var string
+     */
+    protected $table_name = 'book_taxonomies';
+
+    /**
+     * String used to alias the database table in MySQL statements
+     *
+     * @var string
+     */
+    protected $table_alias = 'btax';
+
+    /**
+     * Name of class used to set up the database schema
+     *
+     * @var string
+     */
+    protected $table_schema = BookTaxonomiesSchema::class;
+
+    /**
+     * Name for a single item
+     *
+     * @var string
+     */
+    protected $item_name = 'book_taxonomy';
+
+    /**
+     * Plural version for a group of items
+     *
+     * @var string
+     */
+    protected $item_name_plural = 'book_taxonomies';
+
+    /**
+     * Class name to turn IDs into these objects
+     *
+     * @var string
+     */
+    protected $item_shape = BookTaxonomy::class;
+
+    /**
+     * Group to cache queries and queried items to
+     *
+     * @var string
+     */
+    protected $cache_group = 'book_taxonomies';
+
+    /**
+     * Query constructor.
+     *
+     * @param  array  $args
+     */
+    public function __construct($args = array())
+    {
+        parent::__construct($args);
+    }
+
+}
diff --git a/src/Database/BookTaxonomies/BookTaxonomiesSchema.php b/src/Database/BookTaxonomies/BookTaxonomiesSchema.php
new file mode 100644
index 00000000..1239f865
--- /dev/null
+++ b/src/Database/BookTaxonomies/BookTaxonomiesSchema.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Book Taxonomies Schema
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\BookTaxonomies;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class BookTaxonomiesSchema
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookTaxonomiesSchema extends BerlinDB\Database\Schema
+{
+
+    /**
+     * Array of database columns
+     *
+     * @var array
+     */
+    public $columns = array(
+
+        // id
+        array(
+            'name'     => 'id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'extra'    => 'auto_increment',
+            'primary'  => true,
+            'sortable' => true
+        ),
+
+        // name
+        array(
+            'name'       => 'name',
+            'type'       => 'varchar',
+            'length'     => '32',
+            'sortable'   => true,
+            'searchable' => true,
+            'validate'   => 'sanitize_text_field'
+        ),
+
+        // slug
+        array(
+            'name'     => 'slug',
+            'type'     => 'varchar',
+            'length'   => '32',
+            'sortable' => true,
+            'validate' => 'sanitize_key'
+        ),
+
+        // format
+        array(
+            'name'     => 'format',
+            'type'     => 'varchar',
+            'length'   => '32',
+            'sortable' => true,
+            'default'  => 'text',
+            'validate' => 'sanitize_text_field'
+        ),
+
+        // date_created
+        array(
+            'name'       => 'date_created',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'created'    => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+        // date_modified
+        array(
+            'name'       => 'date_modified',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'modified'   => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+    );
+
+}
diff --git a/src/Database/BookTaxonomies/BookTaxonomiesTable.php b/src/Database/BookTaxonomies/BookTaxonomiesTable.php
new file mode 100644
index 00000000..0a992878
--- /dev/null
+++ b/src/Database/BookTaxonomies/BookTaxonomiesTable.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Book Taxonomies Table
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\BookTaxonomies;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class BookTaxonomiesTable
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookTaxonomiesTable extends BerlinDB\Database\Table
+{
+
+    /**
+     * @var string Table name
+     */
+    protected $name = 'book_taxonomies';
+
+    /**
+     * @var int Database version in format {YYYY}{MM}{DD}{1}
+     */
+    protected $version = 201910111;
+
+    /**
+     * @var array Upgrades to perform
+     */
+    protected $upgrades = array();
+
+    /**
+     * Book_Taxonomies_Table constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Set up the database schema
+     */
+    protected function set_schema()
+    {
+        $this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+			name varchar(32) NOT NULL DEFAULT '',
+			slug varchar(32) NOT NULL DEFAULT '',
+			format varchar(32) NOT NULL DEFAULT 'text',
+			date_created datetime NOT NULL,
+			date_modified datetime NOT NULL,
+			INDEX slug( slug )";
+    }
+
+}
diff --git a/src/Database/BookTerm/BookTermRelationshipQuery.php b/src/Database/BookTerm/BookTermRelationshipQuery.php
new file mode 100644
index 00000000..b44a06fb
--- /dev/null
+++ b/src/Database/BookTerm/BookTermRelationshipQuery.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Book Term Relationships Query
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\BookTerm;
+
+use Book_Database\BerlinDB;
+use Book_Database\Models\BookTermRelationship;
+
+/**
+ * Class BookTermRelationshipQuery
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookTermRelationshipQuery extends BerlinDB\Database\Query
+{
+
+    /**
+     * Name of the table to query
+     *
+     * @var string
+     */
+    protected $table_name = 'book_term_relationships';
+
+    /**
+     * String used to alias the database table in MySQL statements
+     *
+     * @var string
+     */
+    protected $table_alias = 'btr';
+
+    /**
+     * Name of class used to set up the database schema
+     *
+     * @var string
+     */
+    protected $table_schema = BookTermRelationshipsSchema::class;
+
+    /**
+     * Name for a single item
+     *
+     * @var string
+     */
+    protected $item_name = 'book_term_relationship';
+
+    /**
+     * Plural version for a group of items
+     *
+     * @var string
+     */
+    protected $item_name_plural = 'book_term_relationships';
+
+    /**
+     * Class name to turn IDs into these objects
+     *
+     * @var string
+     */
+    protected $item_shape = BookTermRelationship::class;
+
+    /**
+     * Group to cache queries and queried items to
+     *
+     * @var string
+     */
+    protected $cache_group = 'book_term_relationships';
+
+    /**
+     * Query constructor.
+     *
+     * @param  array  $args
+     */
+    public function __construct($args = array())
+    {
+        parent::__construct($args);
+    }
+
+}
diff --git a/src/Database/BookTerm/BookTermRelationshipsSchema.php b/src/Database/BookTerm/BookTermRelationshipsSchema.php
new file mode 100644
index 00000000..a8ad04ae
--- /dev/null
+++ b/src/Database/BookTerm/BookTermRelationshipsSchema.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Book Term Relationships Schema
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\BookTerm;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class BookTermRelationshipsSchema
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookTermRelationshipsSchema extends BerlinDB\Database\Schema
+{
+
+    /**
+     * Array of database columns
+     *
+     * @var array
+     */
+    public $columns = array(
+
+        // id
+        array(
+            'name'     => 'id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'extra'    => 'auto_increment',
+            'primary'  => true,
+            'sortable' => true
+        ),
+
+        // term_id
+        array(
+            'name'     => 'term_id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'sortable' => true
+        ),
+
+        // book_id
+        array(
+            'name'     => 'book_id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'sortable' => true
+        ),
+
+        // date_created
+        array(
+            'name'       => 'date_created',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'created'    => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+        // date_modified
+        array(
+            'name'       => 'date_modified',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'modified'   => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+    );
+
+}
diff --git a/src/Database/BookTerm/BookTermRelationshipsTable.php b/src/Database/BookTerm/BookTermRelationshipsTable.php
new file mode 100644
index 00000000..b9835461
--- /dev/null
+++ b/src/Database/BookTerm/BookTermRelationshipsTable.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Book Term Relationships Table
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\BookTerm;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class Book_Term_Relationships_Table
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookTermRelationshipsTable extends BerlinDB\Database\Table
+{
+
+    /**
+     * @var string Table name
+     */
+    protected $name = 'book_term_relationships';
+
+    /**
+     * @var int Database version in format {YYYY}{MM}{DD}{1}
+     */
+    protected $version = 201910124;
+
+    /**
+     * @var array Upgrades to perform
+     */
+    protected $upgrades = array(
+        '201910122' => 201910122,
+        '201910123' => 201910123,
+        '201910124' => 201910124
+    );
+
+    /**
+     * Book_Term_Relationships_Table constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Set up the database schema
+     */
+    protected function set_schema()
+    {
+        $this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+			term_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
+			book_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
+			date_created datetime NOT NULL,
+			date_modified datetime NOT NULL,
+			INDEX book_id (book_id),
+			INDEX term_id (term_id)";
+    }
+
+    /**
+     * If the old `wp_bdb_book_term_relationships_db_version` option exists, copy that value to our new version key.
+     * This will ensure new upgrades are processed on old installs.
+     */
+    public function maybe_upgrade()
+    {
+
+        $old_key     = $this->get_db()->prefix.'bdb_book_term_relationships_db_version';
+        $old_version = get_option($old_key);
+
+        if (false !== $old_version) {
+            update_option($this->db_version_key, get_option($old_key));
+
+            delete_option($old_key);
+        }
+
+        parent::maybe_upgrade();
+
+    }
+
+    /**
+     * Upgrade to version 201910122
+     *      - Rename `ID` to `id` & add `unsigned`
+     *
+     * @return bool
+     */
+    protected function __201910122()
+    {
+
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} CHANGE `ID` `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT");
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910123
+     *      - Add `unsigned` to `term_id` and `book_id`
+     *
+     * @return bool
+     */
+    protected function __201910123()
+    {
+
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} MODIFY term_id bigint(20) UNSIGNED NOT NULL DEFAULT 0");
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} MODIFY book_id bigint(20) UNSIGNED NOT NULL DEFAULT 0");
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910124
+     *      - Add `date_created` column
+     *      - Add `date_modified` column
+     *
+     * @return bool
+     */
+    protected function __201910124()
+    {
+
+        $result = $this->column_exists('date_created');
+
+        if (! $result) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD COLUMN date_created datetime NOT NULL DEFAULT '0000-00-00 00:00:00'");
+        }
+
+        $result = $this->column_exists('date_modified');
+
+        if (! $result) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD COLUMN date_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00'");
+        }
+
+        return $this->is_success($result);
+
+    }
+
+}
diff --git a/src/Database/BookTerms/BookTermsQuery.php b/src/Database/BookTerms/BookTermsQuery.php
new file mode 100644
index 00000000..80028dc3
--- /dev/null
+++ b/src/Database/BookTerms/BookTermsQuery.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Book Terms Query
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\BookTerms;
+
+use Book_Database\BerlinDB;
+use Book_Database\Models\BookTerm;
+
+/**
+ * Class Book_Terms_Query
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookTermsQuery extends BerlinDB\Database\Query
+{
+
+    /**
+     * Name of the table to query
+     *
+     * @var string
+     */
+    protected $table_name = 'book_terms';
+
+    /**
+     * String used to alias the database table in MySQL statements
+     *
+     * @var string
+     */
+    protected $table_alias = 'bt';
+
+    /**
+     * Name of class used to set up the database schema
+     *
+     * @var string
+     */
+    protected $table_schema = BookTermsSchema::class;
+
+    /**
+     * Name for a single item
+     *
+     * @var string
+     */
+    protected $item_name = 'book_term';
+
+    /**
+     * Plural version for a group of items
+     *
+     * @var string
+     */
+    protected $item_name_plural = 'book_terms';
+
+    /**
+     * Class name to turn IDs into these objects
+     *
+     * @var string
+     */
+    protected $item_shape = BookTerm::class;
+
+    /**
+     * Group to cache queries and queried items to
+     *
+     * @var string
+     */
+    protected $cache_group = 'book_terms';
+
+    /**
+     * Query constructor.
+     *
+     * @param  array  $args
+     */
+    public function __construct($args = array())
+    {
+        parent::__construct($args);
+    }
+
+}
diff --git a/src/Database/BookTerms/BookTermsSchema.php b/src/Database/BookTerms/BookTermsSchema.php
new file mode 100644
index 00000000..50d11b7a
--- /dev/null
+++ b/src/Database/BookTerms/BookTermsSchema.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Book Terms Schema
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\BookTerms;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class BookTermsSchema
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookTermsSchema extends BerlinDB\Database\Schema
+{
+
+    /**
+     * Array of database columns
+     *
+     * @var array
+     */
+    public $columns = array(
+
+        // id
+        array(
+            'name'     => 'id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'extra'    => 'auto_increment',
+            'primary'  => true,
+            'sortable' => true
+        ),
+
+        // taxonomy
+        array(
+            'name'     => 'taxonomy',
+            'type'     => 'varchar',
+            'length'   => '32',
+            'sortable' => true,
+            'validate' => 'sanitize_text_field'
+        ),
+
+        // name
+        array(
+            'name'       => 'name',
+            'type'       => 'varchar',
+            'length'     => '200',
+            'sortable'   => true,
+            'searchable' => true,
+            'validate'   => 'sanitize_text_field'
+        ),
+
+        // slug
+        array(
+            'name'       => 'slug',
+            'type'       => 'varchar',
+            'length'     => '200',
+            'sortable'   => true,
+            'searchable' => true,
+            'validate'   => 'sanitize_key'
+        ),
+
+        // description
+        array(
+            'name'     => 'description',
+            'type'     => 'longtext',
+            'validate' => 'wp_kses_post'
+        ),
+
+        // image_id
+        array(
+            'name'       => 'image_id',
+            'type'       => 'bigint',
+            'length'     => '20',
+            'unsigned'   => true,
+            'sortable'   => true,
+            'allow_null' => true,
+            'default'    => null,
+            'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
+        ),
+
+        // links
+        array(
+            'name' => 'links',
+            'type' => 'longtext',
+        ),
+
+        // book_count
+        array(
+            'name'     => 'book_count',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'sortable' => true
+        ),
+
+        // date_created
+        array(
+            'name'       => 'date_created',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'created'    => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+        // date_modified
+        array(
+            'name'       => 'date_modified',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'modified'   => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+    );
+
+}
diff --git a/src/Database/BookTerms/BookTermsTable.php b/src/Database/BookTerms/BookTermsTable.php
new file mode 100644
index 00000000..6c235563
--- /dev/null
+++ b/src/Database/BookTerms/BookTermsTable.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * Book Terms Table
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\BookTerms;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class BookTermsTable
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookTermsTable extends BerlinDB\Database\Table
+{
+
+    /**
+     * @var string Table name
+     */
+    protected $name = 'book_terms';
+
+    /**
+     * @var int Database version in format {YYYY}{MM}{DD}{1}
+     */
+    protected $version = 201910181;
+
+    /**
+     * @var array Upgrades to perform
+     */
+    protected $upgrades = array(
+        '201910122' => 201910122,
+        '201910123' => 201910123,
+        '201910125' => 201910125,
+        '201910126' => 201910126,
+        '201910181' => 201910181
+    );
+
+    /**
+     * Book_Terms_Table constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Set up the database schema
+     */
+    protected function set_schema()
+    {
+        $this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+			taxonomy varchar(32) NOT NULL DEFAULT '',
+			name varchar(200) NOT NULL DEFAULT '',
+			slug varchar(200) NOT NULL DEFAULT '',
+			description longtext NOT NULL DEFAULT '',
+			image_id bigint(20) UNSIGNED DEFAULT NULL,
+			links longtext NOT NULL DEFAULT '',
+			book_count bigint(20) UNSIGNED NOT NULL DEFAULT 0,
+			date_created datetime NOT NULL,
+			date_modified datetime NOT NULL,
+			INDEX id_taxonomy_name (id, taxonomy, name),
+			INDEX id_taxonomy_slug (id, taxonomy, slug),
+			INDEX taxonomy (taxonomy),
+			INDEX name (name)";
+    }
+
+    /**
+     * If the old `wp_bdb_book_terms_db_version` option exists, copy that value to our new version key.
+     * This will ensure new upgrades are processed on old installs.
+     */
+    public function maybe_upgrade()
+    {
+
+        $old_key     = $this->get_db()->prefix.'bdb_book_terms_db_version';
+        $old_version = get_option($old_key);
+
+        if (false !== $old_version) {
+            update_option($this->db_version_key, get_option($old_key));
+
+            delete_option($old_key);
+        }
+
+        return parent::maybe_upgrade();
+
+    }
+
+    /**
+     * Upgrade to version 201910122
+     *      - Rename `term_id` to `id` & add `unsigned`
+     *
+     * @return bool
+     */
+    protected function __201910122()
+    {
+
+        $result = true;
+
+        // Drop keys involving `term_id` or `type`.
+        if ($this->get_db()->query("SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'id_type_name'")) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} DROP INDEX id_type_name");
+        }
+        if ($this->get_db()->query("SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'id_type_slug'")) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} DROP INDEX id_type_slug");
+        }
+        if ($this->get_db()->query("SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'type'")) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} DROP INDEX type");
+        }
+
+        if ($result && $this->column_exists('term_id')) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} CHANGE `term_id` `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT");
+        }
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910123
+     *      - Change `image` to `image_id` & add `unsigned`
+     *
+     * @return bool
+     */
+    protected function __201910123()
+    {
+
+        if ($this->column_exists('image')) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} CHANGE `image` `image_id` bigint(20) UNSIGNED NOT NULL DEFAULT 0");
+        } else {
+            $result = true;
+        }
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910125
+     *      - Add `date_created` column
+     *      - Add `date_modified` column
+     *
+     * @return bool
+     */
+    protected function __201910125()
+    {
+
+        $result = $this->column_exists('date_created');
+
+        if (! $result) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD COLUMN date_created datetime NOT NULL DEFAULT '0000-00-00 00:00:00'");
+        }
+
+        $result = $this->column_exists('date_modified');
+
+        if (! $result) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD COLUMN date_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00'");
+        }
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910126
+     *      - Change `type` to `taxonomy`
+     *      - Add new indexes
+     *
+     * @return bool
+     */
+    protected function __201910126()
+    {
+
+        if ($this->column_exists('type')) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} CHANGE `type` `taxonomy` varchar(32) NOT NULL DEFAULT ''");
+        } else {
+            $result = true;
+        }
+
+        // Add new indexes.
+        if ($result) {
+            if (! $this->get_db()->query("SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'id_taxonomy_name'")) {
+                $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD UNIQUE KEY id_taxonomy_name (id, taxonomy, name)");
+            }
+            if (! $this->get_db()->query("SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'id_taxonomy_slug'")) {
+                $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD UNIQUE KEY id_taxonomy_slug (id, taxonomy, slug)");
+            }
+            if (! $this->get_db()->query("SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'taxonomy'")) {
+                $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD KEY taxonomy (taxonomy)");
+            }
+        }
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910181
+     *      - Change `count` to `book_count`
+     *
+     * @return bool
+     */
+    protected function __201910181()
+    {
+
+        if ($this->column_exists('count') && ! $this->column_exists('book_count')) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} CHANGE `count` `book_count` bigint(20) UNSIGNED NOT NULL DEFAULT 0");
+        } else {
+            $result = true;
+        }
+
+        return $this->is_success($result);
+
+    }
+
+}
diff --git a/src/Database/Books/BookMetaTable.php b/src/Database/Books/BookMetaTable.php
new file mode 100644
index 00000000..4abee45c
--- /dev/null
+++ b/src/Database/Books/BookMetaTable.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Book Meta Table
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Books;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class BookMetaTable
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookMetaTable extends BerlinDB\Database\Table
+{
+
+    /**
+     * @var string Table name
+     */
+    protected $name = 'bookmeta';
+
+    /**
+     * @var int Database version in format {YYYY}{MM}{DD}{1}
+     */
+    protected $version = 201910271;
+
+    /**
+     * @var array Upgrades to perform
+     */
+    protected $upgrades = array();
+
+    /**
+     * Reviews_Table constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Set up the database schema
+     */
+    protected function set_schema()
+    {
+        $max_index_length = 191;
+        $this->schema     = "meta_id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+			bdb_book_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
+			meta_key varchar(255) DEFAULT NULL,
+			meta_value longtext DEFAULT NULL,
+			INDEX bdb_book_id (bdb_book_id),
+			INDEX meta_key (meta_key({$max_index_length}))";
+    }
+
+}
diff --git a/src/Database/Books/BooksQuery.php b/src/Database/Books/BooksQuery.php
new file mode 100644
index 00000000..071582db
--- /dev/null
+++ b/src/Database/Books/BooksQuery.php
@@ -0,0 +1,316 @@
+<?php
+/**
+ * Books Query
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Books;
+
+use Book_Database\BerlinDB;
+use Book_Database\BerlinDB\Database\Queries\Tax;
+use Book_Database\Models\Book;
+use Book_Database\Database\Authors\AuthorsQuery;
+use Book_Database\Database\Editions\EditionsQuery;
+use Book_Database\Database\ReadingLogs\ReadingLogsQuery;
+use Book_Database\Database\Reviews\ReviewsQuery;
+use Book_Database\Database\Series\SeriesQuery;
+use Book_Database\Where_Clause;
+use function Book_Database\book_database;
+
+/**
+ * Class BooksQuery
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BooksQuery extends BerlinDB\Database\Query
+{
+
+    /**
+     * Name of the table to query
+     *
+     * @var string
+     */
+    protected $table_name = 'books';
+
+    /**
+     * String used to alias the database table in MySQL statements
+     *
+     * @var string
+     */
+    protected $table_alias = 'book';
+
+    /**
+     * Name of class used to set up the database schema
+     *
+     * @var string
+     */
+    protected $table_schema = BooksSchema::class;
+
+    /**
+     * Name for a single item
+     *
+     * @var string
+     */
+    protected $item_name = 'book';
+
+    /**
+     * Plural version for a group of items
+     *
+     * @var string
+     */
+    protected $item_name_plural = 'books';
+
+    /**
+     * Class name to turn IDs into these objects
+     *
+     * @var string
+     */
+    protected $item_shape = Book::class;
+
+    /**
+     * Group to cache queries and queried items to
+     *
+     * @var string
+     */
+    protected $cache_group = 'books';
+
+    /**
+     * Query constructor.
+     *
+     * @param  array  $args
+     */
+    public function __construct($args = array())
+    {
+        parent::__construct($args);
+    }
+
+    /**
+     * Query for books
+     *
+     * @param  array  $args
+     *
+     * @return object[]|int
+     */
+    public function get_books($args = array())
+    {
+
+        $args = wp_parse_args($args, array(
+            'author_query'      => array(),
+            'book_query'        => array(),
+            'series_query'      => array(),
+            'reading_log_query' => array(),
+            'review_query'      => array(),
+            'edition_query'     => array(),
+            'tax_query'         => array(),
+            'unread'            => false,
+            'orderby'           => 'book.id',
+            'order'             => 'DESC',
+            'include_rating'    => true,
+            'include_review'    => false, // Whether or not to always include review data.
+            'number'            => 20,
+            'offset'            => 0,
+            'count'             => false
+        ));
+
+        $select = $join = $where = array();
+
+        $clause_engine = new Where_Clause();
+
+        $tbl_books    = book_database()->get_table('books')->get_table_name();
+        $tbl_author   = book_database()->get_table('authors')->get_table_name();
+        $tbl_author_r = book_database()->get_table('book_author_relationships')->get_table_name();
+        $tbl_ed       = book_database()->get_table('editions')->get_table_name();
+        $tbl_log      = book_database()->get_table('reading_log')->get_table_name();
+        $tbl_series   = book_database()->get_table('series')->get_table_name();
+        $tbl_reviews  = book_database()->get_table('reviews')->get_table_name();
+
+        // Select
+        $select = array(
+            'book.*',
+            "GROUP_CONCAT( DISTINCT author.id SEPARATOR ',' ) as author_id",
+            "GROUP_CONCAT( DISTINCT author.name SEPARATOR ',' ) as author_name",
+            'series.id as series_id',
+            'series.name as series_name'
+        );
+
+        // Author Join
+        $join['author_query'] = "LEFT JOIN {$tbl_author_r} AS ar ON book.id = ar.book_id LEFT JOIN {$tbl_author} AS author ON ar.author_id = author.id";
+
+        // Series Join
+        $join['series_query'] = "LEFT JOIN {$tbl_series} AS series ON book.series_id = series.id";
+
+        // Average Rating
+        if (! empty($args['include_rating'])) {
+            $join['average_rating_select'] = "LEFT JOIN {$tbl_log} AS avg_rating ON (book.id = avg_rating.book_id AND avg_rating.rating IS NOT NULL)";
+            $select[]                      = 'ROUND( AVG( avg_rating.rating ), 2 ) as avg_rating';
+        }
+
+        /**
+         * Where
+         */
+
+        // Author query
+        if (! empty($args['author_query'])) {
+            $clause_engine->set_table_query(new AuthorsQuery());
+            $clause_engine->set_args($args['author_query']);
+            $where = array_merge($where, $clause_engine->get_clauses());
+        }
+
+        // Book query
+        if (! empty($args['book_query'])) {
+            $clause_engine->set_table_query($this);
+            $clause_engine->set_args($args['book_query']);
+            $where = array_merge($where, $clause_engine->get_clauses());
+        }
+
+        // Edition query
+        if (! empty($args['edition_query'])) {
+            $join['edition_query'] = "INNER JOIN {$tbl_ed} AS ed ON (book.id = ed.book_id)";
+            $clause_engine->set_table_query(new EditionsQuery());
+            $clause_engine->set_args($args['edition_query']);
+            $where = array_merge($where, $clause_engine->get_clauses());
+        }
+
+        // Reading log query
+        if (! empty($args['reading_log_query'])) {
+            $join['reading_log_query'] = "INNER JOIN {$tbl_log} AS log ON (book.id = log.book_id)";
+            $clause_engine->set_table_query(new ReadingLogsQuery());
+            $clause_engine->set_args($args['reading_log_query']);
+            $where    = array_merge($where, $clause_engine->get_clauses());
+            $select[] = 'log.id AS log_id, log.user_id AS log_user_id, log.date_started AS date_started, log.date_finished AS date_finished, log.percentage_complete AS percentage_complete, log.rating AS rating';
+        }
+
+        // Review query
+        if (! empty($args['review_query'])) {
+            $join['review_query'] = "INNER JOIN {$tbl_reviews} AS review ON (book.id = review.book_id)";
+            $clause_engine->set_table_query(new ReviewsQuery());
+            $clause_engine->set_args($args['review_query']);
+            $where = array_merge($where, $clause_engine->get_clauses());
+        } elseif (! empty($args['include_review'])) {
+            // Include review data, but as a LEFT JOIN.
+            $join['review_query'] = "LEFT JOIN {$tbl_reviews} AS review ON (book.id = review.book_id)";
+        }
+
+        // Unread books only
+        // This is a bit "special" because we need a weird left join.
+        if (! empty($args['unread'])) {
+            $join['unread_query'] = "LEFT JOIN {$tbl_log} as ulog ON (book.id = ulog.book_id)";
+            $where[]              = 'ulog.book_id IS NULL';
+        }
+
+        // Series query
+        if (! empty($args['series_query'])) {
+            $clause_engine->set_table_query(new SeriesQuery());
+            $clause_engine->set_args($args['series_query']);
+            $where = array_merge($where, $clause_engine->get_clauses());
+        }
+
+        // Tax query
+        if (! empty($args['tax_query'])) {
+            $tax_query          = new Tax($args['tax_query']);
+            $clauses            = $tax_query->get_sql($this->table_alias, 'id');
+            $join['tax_query']  = $clauses['join'];
+            $where['tax_query'] = preg_replace('/^\s*AND\s*/', '', $clauses['where']);
+        }
+
+        // Select review data if we have a review query.
+        if ((! empty($args['review_query']) || ! empty($args['include_review'])) && ! empty($join['review_query'])) {
+            $select[] = 'review.id AS review_id, review.user_id AS review_user_id, review.post_id AS review_post_id, review.url AS review_url, review.date_written AS review_date_written, review.date_published AS review_date_published';
+        }
+
+        /**
+         * Format and query
+         */
+        $select = implode(', ', $select);
+        $join   = implode(' ', $join);
+        $where  = ! empty($where) ? 'WHERE '.implode(' AND ', $where) : '';
+
+        /**
+         * Validate the orderby / order
+         */
+        $orderby = $this->validate_orderby($args['orderby'], $args);
+        $order   = 'ASC' === strtoupper($args['order']) ? 'ASC' : 'DESC';
+
+        $group_by = 'GROUP BY book.id';
+
+        // Override select if we're counting.
+        if (! empty($args['count'])) {
+            $select   = 'COUNT( DISTINCT book.id )';
+            $group_by = '';
+        }
+
+        if (! empty($args['count'])) {
+            $query = "SELECT {$select} FROM {$tbl_books} AS book {$join} {$where}";
+
+            $books = $this->get_db()->get_var($query);
+
+            return absint($books);
+        }
+
+        $query = $this->get_db()->prepare("SELECT {$select} FROM {$tbl_books} AS book {$join} {$where} {$group_by} ORDER BY $orderby $order LIMIT %d,%d;",
+            absint($args['offset']), absint($args['number']));
+
+        $books = $this->get_db()->get_results($query);
+
+        return wp_unslash($books);
+
+    }
+
+    /**
+     * Validate the orderby
+     *
+     * @param  string  $orderby  Desired orderby.
+     * @param  array  $args  Query arguments.
+     *
+     * @return string
+     */
+    protected function validate_orderby($orderby, $args = array())
+    {
+
+        $valid_orderbys = array(
+            'author.id',
+            'author.name',
+            'author.slug',
+            'book.id',
+            'book.title',
+            'book.index_title',
+            'book.series_id',
+            'book.series_position',
+            'book.pub_date',
+            'book.pages',
+            'book.date_created',
+            'book.date_modified',
+            'series.id',
+            'series.name',
+            'series.slug',
+            'series.number_books',
+            'series.date_created',
+        );
+        if (! empty($args['include_rating'])) {
+            $valid_orderbys = $valid_orderbys + array(
+                    'avg_rating.id',
+                    'avg_rating.review_id',
+                    'avg_rating.user_id',
+                    'avg_rating.date_started',
+                    'avg_rating.date_finished',
+                    'avg_rating.percentage_complete',
+                    'avg_rating.rating'
+                );
+        }
+        if (! empty($args['reading_log_query'])) {
+            $valid_orderbys = $valid_orderbys + array(
+                    'log.date_started',
+                    'log.date_finished',
+                    'log.percentage_complete'
+                );
+        }
+
+        return in_array($orderby, $valid_orderbys) ? $orderby : 'book.id';
+
+    }
+
+}
diff --git a/src/Database/Books/BooksSchema.php b/src/Database/Books/BooksSchema.php
new file mode 100644
index 00000000..2f6337f2
--- /dev/null
+++ b/src/Database/Books/BooksSchema.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * Books Schema
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Books;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class BooksSchema
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BooksSchema extends BerlinDB\Database\Schema
+{
+
+    /**
+     * Array of database columns
+     *
+     * @var array
+     */
+    public $columns = array(
+
+        // id
+        array(
+            'name'     => 'id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'extra'    => 'auto_increment',
+            'primary'  => true,
+            'sortable' => true
+        ),
+
+        // cover_id
+        array(
+            'name'       => 'cover_id',
+            'type'       => 'bigint',
+            'length'     => '20',
+            'unsigned'   => true,
+            'sortable'   => true,
+            'allow_null' => true,
+            'default'    => null,
+            'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
+        ),
+
+        // title
+        array(
+            'name'       => 'title',
+            'type'       => 'text',
+            'sortable'   => true,
+            'searchable' => true,
+            'default'    => '',
+            'validate'   => 'sanitize_text_field'
+        ),
+
+        // index_title
+        array(
+            'name'       => 'index_title',
+            'type'       => 'text',
+            'sortable'   => true,
+            'searchable' => true,
+            'default'    => '',
+            'validate'   => 'sanitize_text_field'
+        ),
+
+        // series_id
+        array(
+            'name'       => 'series_id',
+            'type'       => 'bigint',
+            'length'     => '20',
+            'unsigned'   => true,
+            'sortable'   => true,
+            'allow_null' => true,
+            'default'    => null,
+            'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
+        ),
+
+        // series_position
+        array(
+            'name'       => 'series_position',
+            'type'       => 'float',
+            'sortable'   => true,
+            'allow_null' => true,
+            'default'    => null,
+            'validate'   => '\Book_Database\BerlinDB\Sanitization\floatval_int_allow_null'
+        ),
+
+        // pub_date
+        array(
+            'name'       => 'pub_date',
+            'type'       => 'date',
+            'sortable'   => true,
+            'date_query' => true,
+            'validate'   => '\Book_Database\BerlinDB\Sanitization\validate_date'
+        ),
+
+        // pages
+        array(
+            'name'       => 'pages',
+            'type'       => 'bigint',
+            'length'     => '20',
+            'unsigned'   => true,
+            'sortable'   => true,
+            'allow_null' => true,
+            'default'    => null,
+            'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
+        ),
+
+        // synopsis
+        array(
+            'name'     => 'synopsis',
+            'type'     => 'longtext',
+            'validate' => 'wp_kses_post'
+        ),
+
+        // goodreads_url
+        array(
+            'name'     => 'goodreads_url',
+            'type'     => 'text',
+            'validate' => 'sanitize_text_field'
+        ),
+
+        // date_created
+        array(
+            'name'       => 'date_created',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'created'    => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+        // date_modified
+        array(
+            'name'       => 'date_modified',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'modified'   => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+    );
+
+}
diff --git a/src/Database/Books/BooksTable.php b/src/Database/Books/BooksTable.php
new file mode 100644
index 00000000..09bf9de8
--- /dev/null
+++ b/src/Database/Books/BooksTable.php
@@ -0,0 +1,203 @@
+<?php
+/**
+ * Books Table
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Books;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class BooksTable
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BooksTable extends BerlinDB\Database\Table
+{
+
+    /**
+     * @var string Table name
+     */
+    protected $name = 'books';
+
+    /**
+     * @var int Database version in format {YYYY}{MM}{DD}{1}
+     */
+    protected $version = 201910271;
+
+    /**
+     * @var array Upgrades to perform
+     */
+    protected $upgrades = array(
+        '201910092' => 201910092,
+        '201910093' => 201910093,
+        '201910094' => 201910094,
+        '201910095' => 201910095,
+        '201910096' => 201910096,
+        '201910271' => 201910271
+    );
+
+    /**
+     * Books_Table constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Set up the database schema
+     */
+    protected function set_schema()
+    {
+        $this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+			cover_id bigint(20) UNSIGNED DEFAULT NULL,
+			title text NOT NULL,
+			index_title text NOT NULL,
+			series_id bigint(20) UNSIGNED DEFAULT NULL,
+			series_position float DEFAULT NULL,
+			pub_date date DEFAULT NULL,
+			pages bigint(20) UNSIGNED DEFAULT NULL,
+			synopsis longtext NOT NULL,
+			goodreads_url text NOT NULL,
+			date_created datetime NOT NULL,
+			date_modified datetime NOT NULL,
+			INDEX title( title(64) ),
+			INDEX series_id ( series_id )";
+    }
+
+    /**
+     * If the old `wp_bdb_books_db_version` option exists, copy that value to our new version key.
+     * This will ensure new upgrades are processed on old installs.
+     */
+    public function maybe_upgrade()
+    {
+
+        $old_key     = $this->get_db()->prefix.'bdb_books_db_version';
+        $old_version = get_option($old_key);
+
+        if (false !== $old_version) {
+            update_option($this->db_version_key, get_option($old_key));
+
+            delete_option($old_key);
+        }
+
+        parent::maybe_upgrade();
+    }
+
+    /**
+     * Upgrade to version 201910092
+     *      - Rename `ID` to `id` & add `unsigned`
+     *
+     * @return bool
+     */
+    protected function __201910092()
+    {
+
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} CHANGE `ID` `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT");
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910093
+     *      - Rename `cover` to `cover_id` & add `unsigned`
+     *
+     * @return bool
+     */
+    protected function __201910093()
+    {
+
+        if ($this->column_exists('cover')) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} CHANGE `cover` `cover_id` bigint(20) UNSIGNED DEFAULT NULL");
+        } else {
+            $result = true;
+        }
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910094
+     *      - Add `unsigned` to `series_id` and `pages`
+     *
+     * @return bool
+     */
+    protected function __201910094()
+    {
+
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} MODIFY series_id bigint(20) UNSIGNED DEFAULT NULL");
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} MODIFY pages bigint(20) UNSIGNED DEFAULT NULL");
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910095
+     *      - Add `date_created` column
+     *      - Add `date_modified` column
+     *
+     * @return bool
+     */
+    protected function __201910095()
+    {
+
+        $result = $this->column_exists('date_created');
+
+        if (! $result) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD COLUMN date_created datetime NOT NULL DEFAULT '0000-00-00 00:00:00'");
+        }
+
+        $result = $this->column_exists('date_modified');
+
+        if (! $result) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD COLUMN date_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00'");
+        }
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910096
+     *      - Add `title` index
+     *
+     * @return bool
+     */
+    protected function __201910096()
+    {
+
+        if (! $this->get_db()->query("SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'title'")) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD INDEX title( title(64) )");
+        } else {
+            $result = true;
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * Upgrade to version 201910271
+     *      - Convert `pub_date` to a DATE field
+     *
+     * @return bool
+     */
+    protected function __201910271()
+    {
+
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} MODIFY pub_date date DEFAULT NULL");
+
+        return $this->is_success($result);
+
+    }
+
+}
diff --git a/src/Database/Editions/EditionsQuery.php b/src/Database/Editions/EditionsQuery.php
new file mode 100644
index 00000000..7ef11ef4
--- /dev/null
+++ b/src/Database/Editions/EditionsQuery.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Editions Query
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Editions;
+
+use Book_Database\BerlinDB;
+use Book_Database\Models\Edition;
+
+/**
+ * Class EditionsQuery
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class EditionsQuery extends BerlinDB\Database\Query
+{
+
+    /**
+     * Name of the table to query
+     *
+     * @var string
+     */
+    protected $table_name = 'owned_editions';
+
+    /**
+     * String used to alias the database table in MySQL statements
+     *
+     * @var string
+     */
+    protected $table_alias = 'ed';
+
+    /**
+     * Name of class used to set up the database schema
+     *
+     * @var string
+     */
+    protected $table_schema = EditionsSchema::class;
+
+    /**
+     * Name for a single item
+     *
+     * @var string
+     */
+    protected $item_name = 'edition';
+
+    /**
+     * Plural version for a group of items
+     *
+     * @var string
+     */
+    protected $item_name_plural = 'editions';
+
+    /**
+     * Class name to turn IDs into these objects
+     *
+     * @var string
+     */
+    protected $item_shape = Edition::class;
+
+    /**
+     * Group to cache queries and queried items to
+     *
+     * @var string
+     */
+    protected $cache_group = 'editions';
+
+    /**
+     * Query constructor.
+     *
+     * @param  array  $args
+     */
+    public function __construct($args = array())
+    {
+        parent::__construct($args);
+    }
+
+}
diff --git a/src/Database/Editions/EditionsSchema.php b/src/Database/Editions/EditionsSchema.php
new file mode 100644
index 00000000..2e2b9042
--- /dev/null
+++ b/src/Database/Editions/EditionsSchema.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Editions Schema
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Editions;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class EditionsSchema
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class EditionsSchema extends BerlinDB\Database\Schema
+{
+
+    /**
+     * Array of database columns
+     *
+     * @var array
+     */
+    public $columns = array(
+
+        // id
+        array(
+            'name'     => 'id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'extra'    => 'auto_increment',
+            'primary'  => true,
+            'sortable' => true
+        ),
+
+        // book_id
+        array(
+            'name'     => 'book_id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'sortable' => true
+        ),
+
+        // isbn
+        array(
+            'name'     => 'isbn',
+            'type'     => 'varchar',
+            'length'   => '13',
+            'sortable' => true,
+            'validate' => 'sanitize_text_field'
+        ),
+
+        // format
+        array(
+            'name'     => 'format',
+            'type'     => 'varchar',
+            'length'   => '13',
+            'validate' => 'sanitize_text_field'
+        ),
+
+        // date_acquired
+        array(
+            'name'       => 'date_acquired',
+            'type'       => 'datetime',
+            'default'    => null,
+            'allow_null' => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+        // source_id
+        array(
+            'name'       => 'source_id',
+            'type'       => 'bigint',
+            'length'     => '20',
+            'unsigned'   => true,
+            'sortable'   => true,
+            'default'    => null,
+            'allow_null' => true,
+            'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
+        ),
+
+        // signed
+        array(
+            'name'       => 'signed',
+            'type'       => 'int',
+            'length'     => '1',
+            'unsigned'   => true,
+            'sortable'   => true,
+            'allow_null' => true,
+            'default'    => null,
+            'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
+        ),
+
+        // date_created
+        array(
+            'name'       => 'date_created',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'created'    => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+        // date_modified
+        array(
+            'name'       => 'date_modified',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'modified'   => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+    );
+
+}
diff --git a/src/Database/Editions/EditionsTable.php b/src/Database/Editions/EditionsTable.php
new file mode 100644
index 00000000..eea1fc9e
--- /dev/null
+++ b/src/Database/Editions/EditionsTable.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * Editions Table
+ *
+ * @todo      Consider `format` table.
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Editions;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class EditionsTable
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class EditionsTable extends BerlinDB\Database\Table
+{
+
+    /**
+     * @var string Table name
+     */
+    protected $name = 'owned_editions';
+
+    /**
+     * @var int Database version in format {YYYY}{MM}{DD}{1}
+     */
+    protected $version = 202002231;
+
+    /**
+     * @var array Upgrades to perform
+     */
+    protected $upgrades = array(
+        '201910132' => 201910132,
+        '201910133' => 201910133,
+        '201910134' => 201910134,
+        '201910135' => 201910135,
+        '201910141' => 201910141,
+        '202002231' => 202002231
+    );
+
+    /**
+     * Owned_Editions_Table constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Set up the database schema
+     */
+    protected function set_schema()
+    {
+        $this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+			book_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
+			isbn varchar(13) NOT NULL DEFAULT '',
+			format varchar(200) NOT NULL DEFAULT '',
+			date_acquired datetime DEFAULT NULL,
+			source_id bigint(20) UNSIGNED DEFAULT NULL,
+			signed int(1) UNSIGNED DEFAULT NULL,
+			date_created datetime NOT NULL,
+			date_modified datetime NOT NULL,
+			INDEX book_id (book_id),
+			INDEX isbn (isbn),
+			INDEX date_acquired (date_acquired)";
+    }
+
+    /**
+     * If the old `wp_bdb_owned_editions_db_version` option exists, copy that value to our new version key.
+     * This will ensure new upgrades are processed on old installs.
+     */
+    public function maybe_upgrade()
+    {
+        $old_key     = $this->get_db()->prefix.'bdb_owned_editions_db_version';
+        $old_version = get_option($old_key);
+
+        if (false !== $old_version) {
+            update_option($this->db_version_key, get_option($old_key));
+
+            delete_option($old_key);
+        }
+
+        parent::maybe_upgrade();
+    }
+
+    /**
+     * Upgrade to version 201910132
+     *      - Rename `ID` to `id` & add `unsigned`
+     *
+     * @return bool
+     */
+    protected function __201910132()
+    {
+
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} CHANGE `ID` `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT");
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910133
+     *      - Rename `source` to `source_id` & add `unsigned`
+     *
+     * @return bool
+     */
+    protected function __201910133()
+    {
+
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} CHANGE `source` source_id bigint(20) UNSIGNED DEFAULT NULL");
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910134
+     *      - Add `date_created` column
+     *      - Add `date_modified` column
+     *
+     * @return bool
+     */
+    protected function __201910134()
+    {
+
+        $result = $this->column_exists('date_created');
+
+        if (! $result) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD COLUMN date_created datetime NOT NULL DEFAULT '0000-00-00 00:00:00'");
+        }
+
+        $result = $this->column_exists('date_modified');
+
+        if (! $result) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD COLUMN date_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00'");
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * Upgrade to version 201910135
+     *      - Add `isbn` index
+     *
+     * @return bool
+     */
+    protected function __201910135()
+    {
+
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD INDEX isbn (isbn)");
+
+        return $result;
+
+    }
+
+    /**
+     * Upgrade to version 201910141
+     *      - Add `date_acquired` index
+     *
+     * @return bool
+     */
+    protected function __201910141()
+    {
+
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD INDEX date_acquired (date_acquired)");
+
+        return $result;
+
+    }
+
+    /**
+     * Upgrade to version 202002231
+     *      - Allow `date_acquired` to be `null`.
+     *
+     * @return bool
+     */
+    protected function __202002231()
+    {
+
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} MODIFY date_acquired datetime DEFAULT NULL");
+
+        return $this->is_success($result);
+
+    }
+
+}
diff --git a/src/Database/ReadingLogs/ReadingLogsQuery.php b/src/Database/ReadingLogs/ReadingLogsQuery.php
new file mode 100644
index 00000000..d0ea9f23
--- /dev/null
+++ b/src/Database/ReadingLogs/ReadingLogsQuery.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Reading Logs Query
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\ReadingLogs;
+
+use Book_Database\BerlinDB;
+use Book_Database\Models\ReadingLog;
+
+/**
+ * Class ReadingLogsQuery
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class ReadingLogsQuery extends BerlinDB\Database\Query
+{
+
+    /**
+     * Name of the table to query
+     *
+     * @var string
+     */
+    protected $table_name = 'reading_log';
+
+    /**
+     * String used to alias the database table in MySQL statements
+     *
+     * @var string
+     */
+    protected $table_alias = 'log';
+
+    /**
+     * Name of class used to set up the database schema
+     *
+     * @var string
+     */
+    protected $table_schema = ReadingLogsSchema::class;
+
+    /**
+     * Name for a single item
+     *
+     * @var string
+     */
+    protected $item_name = 'reading_log';
+
+    /**
+     * Plural version for a group of items
+     *
+     * @var string
+     */
+    protected $item_name_plural = 'reading_logs';
+
+    /**
+     * Class name to turn IDs into these objects
+     *
+     * @var string
+     */
+    protected $item_shape = ReadingLog::class;
+
+    /**
+     * Group to cache queries and queried items to
+     *
+     * @var string
+     */
+    protected $cache_group = 'reading_logs';
+
+    /**
+     * Query constructor.
+     *
+     * @param  array  $args
+     */
+    public function __construct($args = array())
+    {
+        parent::__construct($args);
+    }
+
+}
diff --git a/src/Database/ReadingLogs/ReadingLogsSchema.php b/src/Database/ReadingLogs/ReadingLogsSchema.php
new file mode 100644
index 00000000..9454b515
--- /dev/null
+++ b/src/Database/ReadingLogs/ReadingLogsSchema.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Reading Logs Schema
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\ReadingLogs;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class ReadingLogsSchema
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class ReadingLogsSchema extends BerlinDB\Database\Schema
+{
+
+    /**
+     * Array of database columns
+     *
+     * @var array
+     */
+    public $columns = array(
+
+        // id
+        array(
+            'name'     => 'id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'extra'    => 'auto_increment',
+            'primary'  => true,
+            'sortable' => true
+        ),
+
+        // book_id
+        array(
+            'name'     => 'book_id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'sortable' => true,
+            'default'  => 0
+        ),
+
+        // edition_id
+        array(
+            'name'       => 'edition_id',
+            'type'       => 'bigint',
+            'length'     => '20',
+            'unsigned'   => true,
+            'sortable'   => true,
+            'allow_null' => true,
+            'default'    => null,
+            'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
+        ),
+
+        // user_id
+        array(
+            'name'     => 'user_id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'sortable' => true,
+            'default'  => 0
+        ),
+
+        // date_started
+        array(
+            'name'       => 'date_started',
+            'type'       => 'datetime',
+            'sortable'   => true,
+            'date_query' => true,
+            'allow_null' => true,
+            'default'    => null
+        ),
+
+        // date_finished
+        array(
+            'name'       => 'date_finished',
+            'type'       => 'datetime',
+            'sortable'   => true,
+            'date_query' => true,
+            'allow_null' => true,
+            'default'    => null
+        ),
+
+        // percentage_complete
+        array(
+            'name'     => 'percentage_complete',
+            'type'     => 'decimal',
+            'length'   => '5,4',
+            'unsigned' => true,
+            'sortable' => true,
+            'default'  => 0.00,
+        ),
+
+        // rating
+        array(
+            'name'       => 'rating',
+            'type'       => 'decimal',
+            'length'     => '4,2',
+            'unsigned'   => true,
+            'sortable'   => true,
+            'allow_null' => true,
+            'default'    => null
+        ),
+
+        // date_modified
+        array(
+            'name'       => 'date_modified',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'modified'   => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+    );
+
+}
diff --git a/src/Database/ReadingLogs/ReadingLogsTable.php b/src/Database/ReadingLogs/ReadingLogsTable.php
new file mode 100644
index 00000000..5541dcbe
--- /dev/null
+++ b/src/Database/ReadingLogs/ReadingLogsTable.php
@@ -0,0 +1,207 @@
+<?php
+/**
+ * Reading Logs Table
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\ReadingLogs;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class ReadingLogsTable
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class ReadingLogsTable extends BerlinDB\Database\Table
+{
+
+    /**
+     * @var string Table name
+     */
+    protected $name = 'reading_log';
+
+    /**
+     * @var int Database version in format {YYYY}{MM}{DD}{1}
+     */
+    protected $version = 202001281;
+
+    /**
+     * @var array Upgrades to perform
+     */
+    protected $upgrades = array(
+        '201910132' => 201910132,
+        '201910133' => 201910133,
+        '201910141' => 201910141,
+        '201910142' => 201910142,
+        '202001281' => 202001281
+    );
+
+    /**
+     * Books_Table constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Set up the database schema
+     */
+    protected function set_schema()
+    {
+        $this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+			book_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
+			edition_id bigint(20) UNSIGNED DEFAULT NULL,
+			user_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
+			date_started datetime DEFAULT NULL,
+			date_finished datetime DEFAULT NULL,
+			percentage_complete decimal(5,4) UNSIGNED NOT NULL DEFAULT 0.00,
+			rating decimal(4,2) DEFAULT NULL,
+			date_modified datetime NOT NULL,
+			INDEX book_id (book_id),
+			INDEX percentage_complete (percentage_complete),
+			INDEX date_finished_book_id (date_finished, book_id),
+			INDEX date_finished_percentage_complete (date_finished, percentage_complete),
+			INDEX date_finished_rating (date_finished, rating),
+			INDEX date_started (date_started),
+			INDEX rating_book_id (rating, book_id),
+			INDEX user_id (user_id)";
+    }
+
+    /**
+     * If the old `wp_bdb_reading_list_db_version` option exists, copy that value to our new version key.
+     * This will ensure new upgrades are processed on old installs.
+     */
+    public function maybe_upgrade()
+    {
+
+        $old_key     = $this->get_db()->prefix.'bdb_reading_list_db_version';
+        $old_version = get_option($old_key);
+
+        if (false !== $old_version) {
+            update_option($this->db_version_key, get_option($old_key));
+
+            delete_option($old_key);
+        }
+
+        parent::maybe_upgrade();
+    }
+
+    /**
+     * Upgrade to version 201910132
+     *      - Rename `ID` to `id` & add `unsigned`
+     *
+     * @return bool
+     */
+    protected function __201910132()
+    {
+
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} CHANGE `ID` `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT");
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910133
+     *      - Add `date_modified` column
+     *
+     * @return bool
+     */
+    protected function __201910133()
+    {
+
+        $result = $this->column_exists('date_modified');
+
+        if (! $result) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD COLUMN date_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00'");
+        }
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910141
+     *      - Change `complete` to `percentage_complete`
+     *
+     * @return bool
+     */
+    protected function __201910141()
+    {
+
+        if ($this->get_db()->query("SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'complete'")) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} DROP INDEX complete");
+        } else {
+            $result = true;
+        }
+
+        if ($result) {
+            if (! $this->column_exists('percentage_complete')) {
+                // First change to `float`.
+                $result = $this->get_db()->query("ALTER TABLE {$this->table_name} CHANGE `complete` `percentage_complete` float UNSIGNED NOT NULL DEFAULT 0");
+
+                if ($result) {
+                    // Now change to divide by 100.
+                    $result = $this->get_db()->query("UPDATE {$this->table_name} SET percentage_complete = percentage_complete / 100 WHERE percentage_complete > 0");
+
+                    // Now change to decimal.
+                    if ($result) {
+                        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} MODIFY `percentage_complete` decimal(5,4) UNSIGNED NOT NULL DEFAULT 0");
+
+                        // Now add an index.
+                        if (! $this->get_db()->query("SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'percentage_complete'")) {
+                            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD INDEX percentage_complete (percentage_complete)");
+                        }
+                    }
+                }
+            }
+        }
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910142
+     *      - Remove `dnf` rating values
+     *      - Change `rating` to `decimal(4,2)`
+     *
+     * @return bool
+     */
+    protected function __201910142()
+    {
+
+        $result = $this->get_db()->query("UPDATE {$this->table_name} SET rating = NULL WHERE rating = 'dnf'");
+
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} MODIFY rating decimal(4,2) DEFAULT NULL");
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 202001281
+     *      - Add `edition_id` column
+     *
+     * @return bool
+     */
+    protected function __202001281()
+    {
+
+        $result = $this->column_exists('edition_id');
+
+        if (! $result) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD COLUMN edition_id bigint(20) UNSIGNED DEFAULT NULL AFTER book_id");
+        }
+
+        return $this->is_success($result);
+
+    }
+
+}
diff --git a/src/Database/Retailers/RetailersQuery.php b/src/Database/Retailers/RetailersQuery.php
new file mode 100644
index 00000000..4c0292c4
--- /dev/null
+++ b/src/Database/Retailers/RetailersQuery.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Retailers Query
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Retailers;
+
+use Book_Database\BerlinDB;
+use Book_Database\Models\Retailer;
+
+/**
+ * Class RetailersQuery
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class RetailersQuery extends BerlinDB\Database\Query
+{
+
+    /**
+     * Name of the table to query
+     *
+     * @var string
+     */
+    protected $table_name = 'retailers';
+
+    /**
+     * String used to alias the database table in MySQL statements
+     *
+     * @var string
+     */
+    protected $table_alias = 'retailer';
+
+    /**
+     * Name of class used to set up the database schema
+     *
+     * @var string
+     */
+    protected $table_schema = RetailersSchema::class;
+
+    /**
+     * Name for a single item
+     *
+     * @var string
+     */
+    protected $item_name = 'retailer';
+
+    /**
+     * Plural version for a group of items
+     *
+     * @var string
+     */
+    protected $item_name_plural = 'retailers';
+
+    /**
+     * Class name to turn IDs into these objects
+     *
+     * @var string
+     */
+    protected $item_shape = Retailer::class;
+
+    /**
+     * Group to cache queries and queried items to
+     *
+     * @var string
+     */
+    protected $cache_group = 'retailers';
+
+    /**
+     * Query constructor.
+     *
+     * @param  array  $args
+     */
+    public function __construct($args = array())
+    {
+        parent::__construct($args);
+    }
+
+}
diff --git a/src/Database/Retailers/RetailersSchema.php b/src/Database/Retailers/RetailersSchema.php
new file mode 100644
index 00000000..8b3647dd
--- /dev/null
+++ b/src/Database/Retailers/RetailersSchema.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Retailers Schema
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Retailers;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class RetailersSchema
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class RetailersSchema extends BerlinDB\Database\Schema
+{
+
+    /**
+     * Array of database columns
+     *
+     * @var array
+     */
+    public $columns = array(
+
+        // id
+        array(
+            'name'     => 'id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'extra'    => 'auto_increment',
+            'primary'  => true,
+            'sortable' => true
+        ),
+
+        // name
+        array(
+            'name'       => 'name',
+            'type'       => 'varchar',
+            'length'     => '200',
+            'sortable'   => true,
+            'searchable' => true,
+            'validate'   => 'sanitize_text_field'
+        ),
+
+        // template
+        array(
+            'name'     => 'template',
+            'type'     => 'text',
+            'validate' => 'wp_kses_post'
+        ),
+
+        // date_created
+        array(
+            'name'       => 'date_created',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'created'    => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+        // date_modified
+        array(
+            'name'       => 'date_modified',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'modified'   => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+    );
+
+}
diff --git a/src/Database/Retailers/RetailersTable.php b/src/Database/Retailers/RetailersTable.php
new file mode 100644
index 00000000..47685981
--- /dev/null
+++ b/src/Database/Retailers/RetailersTable.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Retailers Table
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Retailers;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class RetailersTable
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class RetailersTable extends BerlinDB\Database\Table
+{
+
+    /**
+     * @var string Table name
+     */
+    protected $name = 'retailers';
+
+    /**
+     * @var int Database version in format {YYYY}{MM}{DD}{1}
+     */
+    protected $version = 201911021;
+
+    /**
+     * @var array Upgrades to perform
+     */
+    protected $upgrades = array(
+        '201911021' => 201911021
+    );
+
+    /**
+     * Book_Taxonomies_Table constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Set up the database schema
+     */
+    protected function set_schema()
+    {
+        $this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+			name varchar(200) NOT NULL DEFAULT '',
+			template text NOT NULL DEFAULT '',
+			date_created datetime NOT NULL,
+			date_modified datetime NOT NULL,
+			INDEX name (name)";
+    }
+
+    /**
+     * Upgrade to version 201911021
+     *      - add `template` column
+     *
+     * @return bool
+     */
+    protected function __201911021()
+    {
+
+        $result = $this->column_exists('template');
+
+        if (! $result) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD COLUMN template text NOT NULL DEFAULT '' AFTER `name`");
+        }
+
+        return $this->is_success($result);
+
+    }
+
+}
diff --git a/src/Database/Reviews/ReviewMetaTable.php b/src/Database/Reviews/ReviewMetaTable.php
new file mode 100644
index 00000000..dec15f6e
--- /dev/null
+++ b/src/Database/Reviews/ReviewMetaTable.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Review Meta Table
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Reviews;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class ReviewMetaTable
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class ReviewMetaTable extends BerlinDB\Database\Table
+{
+
+    /**
+     * @var string Table name
+     */
+    protected $name = 'reviewmeta';
+
+    /**
+     * @var int Database version in format {YYYY}{MM}{DD}{1}
+     */
+    protected $version = 201910274;
+
+    /**
+     * @var array Upgrades to perform
+     */
+    protected $upgrades = array(
+        '201910272' => 201910272,
+        '201910273' => 201910273,
+        '201910274' => 201910274
+    );
+
+    /**
+     * Reviews_Table constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Set up the database schema
+     */
+    protected function set_schema()
+    {
+        $max_index_length = 191;
+        $this->schema     = "meta_id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+			bdb_review_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
+			meta_key varchar(255) DEFAULT NULL,
+			meta_value longtext DEFAULT NULL,
+			INDEX bdb_review_id (bdb_review_id),
+			INDEX meta_key (meta_key({$max_index_length}))";
+    }
+
+    /**
+     * If the old `wp_bdb_reviewmeta_db_version` option exists, copy that value to our new version key.
+     * This will ensure new upgrades are processed on old installs.
+     */
+    public function maybe_upgrade()
+    {
+
+        $old_key     = $this->get_db()->prefix.'bdb_reviewmeta_db_version';
+        $old_version = get_option($old_key);
+
+        if (false !== $old_version) {
+            update_option($this->db_version_key, get_option($old_key));
+
+            delete_option($old_key);
+        }
+
+        return parent::maybe_upgrade();
+    }
+
+    /**
+     * Upgrade to version 201910272
+     *      - Drop the `review_id` index
+     *
+     * @return bool
+     */
+    protected function __201910272()
+    {
+
+        if ($this->get_db()->query("SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'review_id'")) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} DROP INDEX review_id");
+        } else {
+            $result = true;
+        }
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910273
+     *      - Rename `review_id` to `bdb_review_id` & add `unsigned`
+     *
+     * @return bool
+     */
+    protected function __201910273()
+    {
+
+        if ($this->column_exists('review_id')) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} CHANGE `review_id` `bdb_review_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0");
+        } else {
+            $result = true;
+        }
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910274
+     *      - Add a new `bdb_review_id` index
+     *
+     * @return bool
+     */
+    protected function __201910274()
+    {
+
+        $result = $this->get_db()->query("SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'bdb_review_id'");
+
+        if (! $result) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD INDEX bdb_review_id (bdb_review_id)");
+        }
+
+        return $this->is_success($result);
+
+    }
+
+}
diff --git a/src/Database/Reviews/ReviewsQuery.php b/src/Database/Reviews/ReviewsQuery.php
new file mode 100644
index 00000000..620df6f8
--- /dev/null
+++ b/src/Database/Reviews/ReviewsQuery.php
@@ -0,0 +1,321 @@
+<?php
+/**
+ * Reviews Query
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Reviews;
+
+use Book_Database\BerlinDB;
+use Book_Database\BerlinDB\Database\Queries\Tax;
+use Book_Database\Database\Authors\AuthorsQuery;
+use Book_Database\Database\Books\BooksQuery;
+use Book_Database\Database\Editions\EditionsQuery;
+use Book_Database\Database\ReadingLogs\ReadingLogsQuery;
+use Book_Database\Models\Review;
+use Book_Database\Database\Series\SeriesQuery;
+use Book_Database\Where_Clause;
+use function Book_Database\book_database;
+
+/**
+ * Class ReviewsQuery
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class ReviewsQuery extends BerlinDB\Database\Query
+{
+
+    /**
+     * Name of the table to query
+     *
+     * @var string
+     */
+    protected $table_name = 'reviews';
+
+    /**
+     * String used to alias the database table in MySQL statements
+     *
+     * @var string
+     */
+    protected $table_alias = 'review';
+
+    /**
+     * Name of class used to set up the database schema
+     *
+     * @var string
+     */
+    protected $table_schema = ReviewsSchema::class;
+
+    /**
+     * Name for a single item
+     *
+     * @var string
+     */
+    protected $item_name = 'review';
+
+    /**
+     * Plural version for a group of items
+     *
+     * @var string
+     */
+    protected $item_name_plural = 'reviews';
+
+    /**
+     * Class name to turn IDs into these objects
+     *
+     * @var string
+     */
+    protected $item_shape = Review::class;
+
+    /**
+     * Group to cache queries and queried items to
+     *
+     * @var string
+     */
+    protected $cache_group = 'reviews';
+
+    /**
+     * Query constructor.
+     *
+     * @param  array  $args
+     */
+    public function __construct($args = array())
+    {
+        parent::__construct($args);
+    }
+
+    /**
+     * Get the column in this table to join with the taxonomy terms column.
+     *
+     * @return string
+     */
+    protected function get_tax_query_join_column_name()
+    {
+        return 'book_id';
+    }
+
+    /**
+     * Get the column in this table to join with the book column.
+     *
+     * @return string
+     */
+    protected function get_author_query_join_column_name()
+    {
+        return 'book_id';
+    }
+
+    /**
+     * Query for reviews
+     *
+     * @param  array  $args
+     *
+     * @return object[]|int
+     */
+    public function get_reviews(array $args = array())
+    {
+
+        $args = wp_parse_args($args, array(
+            'author_query'      => array(),
+            'book_query'        => array(),
+            'series_query'      => array(),
+            'reading_log_query' => array(),
+            'review_query'      => array(),
+            'edition_query'     => array(),
+            'tax_query'         => array(),
+            'orderby'           => 'review.id',
+            'order'             => 'DESC',
+            'number'            => 20,
+            'offset'            => 0,
+            'count'             => false
+        ));
+
+        $select = $join = $where = array();
+
+        $clause_engine = new Where_Clause();
+
+        $tbl_books    = book_database()->get_table('books')->get_table_name();
+        $tbl_author   = book_database()->get_table('authors')->get_table_name();
+        $tbl_author_r = book_database()->get_table('book_author_relationships')->get_table_name();
+        $tbl_ed       = book_database()->get_table('editions')->get_table_name();
+        $tbl_log      = book_database()->get_table('reading_log')->get_table_name();
+        $tbl_reviews  = book_database()->get_table('reviews')->get_table_name();
+        $tbl_series   = book_database()->get_table('series')->get_table_name();
+
+        // Select
+        $select = array(
+            'review.*',
+            'book.id as book_id',
+            'book.cover_id as book_cover_id',
+            'book.title as book_title',
+            'book.pub_date as book_pub_date',
+            'book.series_position as series_position',
+            "GROUP_CONCAT( DISTINCT author.id SEPARATOR ',' ) as author_id",
+            "GROUP_CONCAT( DISTINCT author.name SEPARATOR ',' ) as author_name",
+            'series.id as series_id',
+            'series.name as series_name',
+            'log.date_started as date_started_reading',
+            'log.date_finished as date_finished_reading',
+            'log.percentage_complete as percentage_complete',
+            'log.rating as rating',
+        );
+
+        // Book Join
+        $join['book_query'] = "LEFT JOIN {$tbl_books} AS book ON review.book_id = book.id";
+
+        // Author Join
+        $join['author_query'] = "LEFT JOIN {$tbl_author_r} AS ar ON review.book_id = ar.book_id LEFT JOIN {$tbl_author} AS author ON ar.author_id = author.id";
+
+        // Series Join
+        $join['series_query'] = "LEFT JOIN {$tbl_series} AS series ON book.series_id = series.id";
+
+        // Reading Log Join
+        $join['reading_log_query'] = "LEFT JOIN {$tbl_log} AS log ON log.id = review.reading_log_id";
+
+        /**
+         * Where
+         */
+
+        // Author query
+        if (! empty($args['author_query'])) {
+            $clause_engine->set_table_query(new AuthorsQuery());
+            $clause_engine->set_args($args['author_query']);
+            $where = array_merge($where, $clause_engine->get_clauses());
+        }
+
+        // Book query
+        if (! empty($args['book_query'])) {
+            $clause_engine->set_table_query(new BooksQuery());
+            $clause_engine->set_args($args['book_query']);
+            $where = array_merge($where, $clause_engine->get_clauses());
+        }
+
+        // Edition query
+        if (! empty($args['edition_query'])) {
+            $join['edition_query'] = "INNER JOIN {$tbl_ed} AS ed ON (review.book_id = ed.book_id)";
+            $clause_engine->set_table_query(new EditionsQuery());
+            $clause_engine->set_args($args['edition_query']);
+            $where = array_merge($where, $clause_engine->get_clauses());
+        }
+
+        // Reading log query
+        if (! empty($args['reading_log_query'])) {
+            $clause_engine->set_table_query(new ReadingLogsQuery());
+            $clause_engine->set_args($args['reading_log_query']);
+            $where = array_merge($where, $clause_engine->get_clauses());
+        }
+
+        // Review query
+        if (! empty($args['review_query'])) {
+            $clause_engine->set_table_query($this);
+            $clause_engine->set_args($args['review_query']);
+            $where = array_merge($where, $clause_engine->get_clauses());
+        }
+
+        // Series query
+        if (! empty($args['series_query'])) {
+            $clause_engine->set_table_query(new SeriesQuery());
+            $clause_engine->set_args($args['series_query']);
+            $where = array_merge($where, $clause_engine->get_clauses());
+        }
+
+        // Tax query
+        if (! empty($args['tax_query'])) {
+            $tax_query          = new Tax($args['tax_query']);
+            $clauses            = $tax_query->get_sql($this->table_alias, 'book_id');
+            $join['tax_query']  = $clauses['join'];
+            $where['tax_query'] = preg_replace('/^\s*AND\s*/', '', $clauses['where']);
+        }
+
+        /**
+         * Format and query
+         */
+        $select = implode(', ', $select);
+        $join   = implode(' ', $join);
+        $where  = ! empty($where) ? 'WHERE '.implode(' AND ', $where) : '';
+
+        /**
+         * Validate the orderby / order
+         */
+        $orderby = $this->validate_orderby($args['orderby'], $args);
+        $order   = 'ASC' === strtoupper($args['order']) ? 'ASC' : 'DESC';
+
+        $group_by = 'GROUP BY review.id';
+
+        // Override select if we're counting.
+        if (! empty($args['count'])) {
+            $select   = 'COUNT( DISTINCT review.id )';
+            $group_by = '';
+        }
+
+        if (! empty($args['count'])) {
+            $query = "SELECT {$select} FROM {$tbl_reviews} AS review {$join} {$where}";
+
+            $reviews = $this->get_db()->get_var($query);
+
+            return absint($reviews);
+        }
+
+        $query = $this->get_db()->prepare("SELECT {$select} FROM {$tbl_reviews} AS review {$join} {$where} {$group_by} ORDER BY $orderby $order LIMIT %d,%d;",
+            absint($args['offset']), absint($args['number']));
+
+        $reviews = $this->get_db()->get_results($query);
+
+        return wp_unslash($reviews);
+
+    }
+
+    /**
+     * Validate the orderby
+     *
+     * @param  string  $orderby  Desired orderby.
+     * @param  array  $args  Query arguments.
+     *
+     * @return string
+     */
+    protected function validate_orderby($orderby, $args = array())
+    {
+
+        $valid_orderbys = array(
+            'review.id',
+            'review.book_id',
+            'review.reading_log_id',
+            'review.user_id',
+            'review.post_id',
+            'review.date_written',
+            'review.date_published',
+            'review.date_created',
+            'review.date_modified',
+            'author.id',
+            'author.name',
+            'author.slug',
+            'book.id',
+            'book.title',
+            'book.index_title',
+            'book.series_id',
+            'book.series_position',
+            'book.pub_date',
+            'book.pages',
+            'book.date_created',
+            'book.date_modified',
+            'series.id',
+            'series.name',
+            'series.slug',
+            'series.number_books',
+            'series.date_created',
+            'log.id',
+            'log.user_id',
+            'log.date_started',
+            'log.date_finished',
+            'log.percentage_complete',
+            'log.rating'
+        );
+
+        return in_array($orderby, $valid_orderbys) ? $orderby : 'review.id';
+
+    }
+
+}
diff --git a/src/Database/Reviews/ReviewsSchema.php b/src/Database/Reviews/ReviewsSchema.php
new file mode 100644
index 00000000..f0bd4d72
--- /dev/null
+++ b/src/Database/Reviews/ReviewsSchema.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Reviews Schema
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Reviews;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class ReviewsSchema
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class ReviewsSchema extends BerlinDB\Database\Schema
+{
+
+    /**
+     * Array of database columns
+     *
+     * @var array
+     */
+    public $columns = array(
+
+        // id
+        array(
+            'name'     => 'id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'extra'    => 'auto_increment',
+            'primary'  => true,
+            'sortable' => true
+        ),
+
+        // book_id
+        array(
+            'name'     => 'book_id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'sortable' => true,
+            'validate' => 'absint'
+        ),
+
+        // reading_log_id
+        array(
+            'name'       => 'reading_log_id',
+            'type'       => 'bigint',
+            'length'     => '20',
+            'unsigned'   => true,
+            'sortable'   => true,
+            'allow_null' => true,
+            'default'    => null,
+            'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
+        ),
+
+        // user_id
+        array(
+            'name'     => 'user_id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'sortable' => true,
+            'validate' => 'absint'
+        ),
+
+        // post_id
+        array(
+            'name'       => 'post_id',
+            'type'       => 'bigint',
+            'length'     => '20',
+            'unsigned'   => true,
+            'sortable'   => true,
+            'allow_null' => true,
+            'default'    => null,
+            'validate'   => '\Book_Database\BerlinDB\Sanitization\absint_allow_null'
+        ),
+
+        // url
+        array(
+            'name'     => 'url',
+            'type'     => 'mediumtext',
+            'default'  => '',
+            'validate' => 'sanitize_text_field'
+        ),
+
+        // review
+        array(
+            'name'     => 'review',
+            'type'     => 'longtext',
+            'validate' => 'wp_kses_post'
+        ),
+
+        // date_written
+        array(
+            'name'       => 'date_written',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'sortable'   => true,
+            'date_query' => true
+        ),
+
+        // date_published
+        array(
+            'name'       => 'date_published',
+            'type'       => 'datetime',
+            'sortable'   => true,
+            'date_query' => true,
+            'allow_null' => true,
+            'default'    => null,
+        ),
+
+        // date_created
+        array(
+            'name'       => 'date_created',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'created'    => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+        // date_modified
+        array(
+            'name'       => 'date_modified',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'modified'   => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+    );
+
+}
diff --git a/src/Database/Reviews/ReviewsTable.php b/src/Database/Reviews/ReviewsTable.php
new file mode 100644
index 00000000..e2d605a3
--- /dev/null
+++ b/src/Database/Reviews/ReviewsTable.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * Reviews Table
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Reviews;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class ReviewsTable
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class ReviewsTable extends BerlinDB\Database\Table
+{
+
+    /**
+     * @var string Table name
+     */
+    protected $name = 'reviews';
+
+    /**
+     * @var int Database version in format {YYYY}{MM}{DD}{1}
+     */
+    protected $version = 201910301;
+
+    /**
+     * @var array Upgrades to perform
+     */
+    protected $upgrades = array(
+        '201910181' => 201910181,
+        '201910182' => 201910182,
+        '201910183' => 201910183,
+        '201910184' => 201910184,
+        '201910185' => 201910185,
+        '201910261' => 201910261,
+        '201910301' => 201910301
+    );
+
+    /**
+     * Reviews_Table constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Set up the database schema
+     */
+    protected function set_schema()
+    {
+        $this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+			book_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
+			reading_log_id bigint(20) UNSIGNED DEFAULT NULL,
+			user_id bigint(20) UNSIGNED NOT NULL DEFAULT 0,
+			post_id bigint(20) UNSIGNED DEFAULT NULL,
+			url mediumtext NOT NULL DEFAULT '',
+			review longtext NOT NULL DEFAULT '',
+			date_written datetime NOT NULL,
+			date_published datetime DEFAULT NULL,
+			date_created datetime NOT NULL,
+			date_modified datetime NOT NULL,
+			INDEX book_id (book_id),
+			INDEX date_written_book_id (date_written, book_id),
+			INDEX date_written_id (date_written, id),
+			INDEX post_id (post_id),
+			INDEX user_id (user_id)";
+    }
+
+    /**
+     * If the old `wp_bdb_reviews_db_version` option exists, copy that value to our new version key.
+     * This will ensure new upgrades are processed on old installs.
+     */
+    public function maybe_upgrade()
+    {
+
+        $old_key     = $this->get_db()->prefix.'bdb_reviews_db_version';
+        $old_version = get_option($old_key);
+
+        if (false !== $old_version) {
+            update_option($this->db_version_key, get_option($old_key));
+
+            delete_option($old_key);
+        }
+
+        return parent::maybe_upgrade();
+    }
+
+    /**
+     * Upgrade to version 201910181
+     *      - Drop the `date_written_ID` index
+     *
+     * @return bool
+     */
+    protected function __201910181()
+    {
+
+        if ($this->get_db()->query("SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'date_written_ID'")) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} DROP INDEX date_written_ID");
+        } else {
+            $result = true;
+        }
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910182
+     *      - Rename `ID` to `id` & add `unsigned`
+     *
+     * @return bool
+     */
+    protected function __201910182()
+    {
+
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} CHANGE `ID` `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT");
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910183
+     *      - Add a new `date_written_id` index
+     *
+     * @return bool
+     */
+    protected function __201910183()
+    {
+
+        $result = $this->get_db()->query("SHOW INDEX FROM {$this->table_name} WHERE Key_name = 'date_written_id'");
+
+        if (! $result) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD INDEX date_written_id (date_written, id)");
+        }
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910184
+     *      - Add `date_created` column
+     *      - Add `date_modified` column
+     *
+     * @return bool
+     */
+    protected function __201910184()
+    {
+
+        $result = $this->column_exists('date_created');
+
+        if (! $result) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD COLUMN date_created datetime NOT NULL DEFAULT '0000-00-00 00:00:00'");
+        }
+
+        $result = $this->column_exists('date_modified');
+
+        if (! $result) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD COLUMN date_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00'");
+        }
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910185
+     *      - Change `book_id` column - add `unsigned`
+     *      - Change `post_id` column - add `unsigned` and allow null
+     *      - Change `user_id` column - add `unsigned`
+     *
+     * @return bool
+     */
+    protected function __201910185()
+    {
+
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} MODIFY book_id bigint(20) UNSIGNED NOT NULL DEFAULT 0");
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} MODIFY post_id bigint(20) UNSIGNED DEFAULT NULL");
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} MODIFY user_id bigint(20) UNSIGNED NOT NULL DEFAULT 0 AFTER book_id");
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910261
+     *      - Drop column `rating`
+     *
+     * @return bool
+     */
+    protected function __201910261()
+    {
+
+        if ($this->column_exists('rating')) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} DROP COLUMN `rating`");
+        } else {
+            $result = true;
+        }
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910301
+     *      - Add `reading_log_id` column
+     *
+     * @return bool
+     */
+    protected function __201910301()
+    {
+
+        $result = $this->column_exists('reading_log_id');
+
+        if (! $result) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD COLUMN reading_log_id bigint(20) UNSIGNED DEFAULT NULL AFTER book_id");
+        }
+
+        return $this->is_success($result);
+
+    }
+
+}
diff --git a/src/Database/Series/SeriesQuery.php b/src/Database/Series/SeriesQuery.php
new file mode 100644
index 00000000..2a7a0f66
--- /dev/null
+++ b/src/Database/Series/SeriesQuery.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Series Query
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Series;
+
+use Book_Database\BerlinDB;
+use Book_Database\Models\Series;
+
+/**
+ * Class SeriesQuery
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class SeriesQuery extends BerlinDB\Database\Query
+{
+
+    /**
+     * Name of the table to query
+     *
+     * @var string
+     */
+    protected $table_name = 'series';
+
+    /**
+     * String used to alias the database table in MySQL statements
+     *
+     * @var string
+     */
+    protected $table_alias = 'series';
+
+    /**
+     * Name of class used to set up the database schema
+     *
+     * @var string
+     */
+    protected $table_schema = SeriesSchema::class;
+
+    /**
+     * Name for a single item
+     *
+     * @var string
+     */
+    protected $item_name = 'series';
+
+    /**
+     * Plural version for a group of items
+     *
+     * @var string
+     */
+    protected $item_name_plural = 'series';
+
+    /**
+     * Class name to turn IDs into these objects
+     *
+     * @var string
+     */
+    protected $item_shape = Series::class;
+
+    /**
+     * Group to cache queries and queried items to
+     *
+     * @var string
+     */
+    protected $cache_group = 'series';
+
+    /**
+     * Query constructor.
+     *
+     * @param  array  $args
+     */
+    public function __construct($args = array())
+    {
+        parent::__construct($args);
+    }
+
+}
diff --git a/src/Database/Series/SeriesSchema.php b/src/Database/Series/SeriesSchema.php
new file mode 100644
index 00000000..6e82b332
--- /dev/null
+++ b/src/Database/Series/SeriesSchema.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Series Schema Schema
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Series;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class SeriesSchema
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class SeriesSchema extends BerlinDB\Database\Schema
+{
+
+    /**
+     * Array of database columns
+     *
+     * @var array
+     */
+    public $columns = array(
+
+        // id
+        array(
+            'name'     => 'id',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'extra'    => 'auto_increment',
+            'primary'  => true,
+            'sortable' => true
+        ),
+
+        // name
+        array(
+            'name'       => 'name',
+            'type'       => 'varchar',
+            'length'     => '200',
+            'sortable'   => true,
+            'searchable' => true,
+            'validate'   => 'sanitize_text_field'
+        ),
+
+        // slug
+        array(
+            'name'       => 'slug',
+            'type'       => 'varchar',
+            'length'     => '200',
+            'sortable'   => true,
+            'searchable' => true,
+            'validate'   => 'sanitize_key'
+        ),
+
+        // description
+        array(
+            'name'     => 'description',
+            'type'     => 'longtext',
+            'validate' => 'wp_kses_post'
+        ),
+
+        // number_books
+        array(
+            'name'     => 'number_books',
+            'type'     => 'bigint',
+            'length'   => '20',
+            'unsigned' => true,
+            'sortable' => true
+        ),
+
+        // date_created
+        array(
+            'name'       => 'date_created',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'created'    => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+        // date_modified
+        array(
+            'name'       => 'date_modified',
+            'type'       => 'datetime',
+            'default'    => '', // True default is current time, set in query class
+            'modified'   => true,
+            'date_query' => true,
+            'sortable'   => true,
+        ),
+
+    );
+
+}
diff --git a/src/Database/Series/SeriesTable.php b/src/Database/Series/SeriesTable.php
new file mode 100644
index 00000000..34d1fdf1
--- /dev/null
+++ b/src/Database/Series/SeriesTable.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Series Table
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Database\Series;
+
+use Book_Database\BerlinDB;
+
+/**
+ * Class SeriesTable
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class SeriesTable extends BerlinDB\Database\Table
+{
+
+    /**
+     * @var string Table name
+     */
+    protected $name = 'series';
+
+    /**
+     * @var int Database version in format {YYYY}{MM}{DD}{1}
+     */
+    protected $version = 201910124;
+
+    /**
+     * @var array Upgrades to perform
+     */
+    protected $upgrades = array(
+        '201910122' => 201910122,
+        '201910123' => 201910123,
+        '201910124' => 201910124
+    );
+
+    /**
+     * Series_Table constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Set up the database schema
+     */
+    protected function set_schema()
+    {
+        $this->schema = "id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+			name varchar(200) NOT NULL DEFAULT '',
+			slug varchar(200) NOT NULL DEFAULT '',
+			description longtext NOT NULL DEFAULT '',
+			number_books bigint(20) UNSIGNED NOT NULL DEFAULT 0,
+			date_created datetime NOT NULL,
+			date_modified datetime NOT NULL,
+			INDEX name (name)";
+    }
+
+    /**
+     * If the old `wp_bdb_series_db_version` option exists, copy that value to our new version key.
+     * This will ensure new upgrades are processed on old installs.
+     */
+    public function maybe_upgrade()
+    {
+
+        $old_key     = $this->get_db()->prefix.'bdb_series_db_version';
+        $old_version = get_option($old_key);
+
+        if (false !== $old_version) {
+            update_option($this->db_version_key, get_option($old_key));
+
+            delete_option($old_key);
+        }
+
+        return parent::maybe_upgrade();
+
+    }
+
+    /**
+     * Upgrade to version 201910122
+     *      - Rename `ID` to `id` & add `unsigned`
+     *
+     * @return bool
+     */
+    protected function __201910122()
+    {
+
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} CHANGE `ID` `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT");
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910123
+     *      - Add `unsigned` to `number_books`
+     *
+     * @return bool
+     */
+    protected function __201910123()
+    {
+
+        $result = $this->get_db()->query("ALTER TABLE {$this->table_name} MODIFY number_books bigint(20) UNSIGNED NOT NULL DEFAULT 0");
+
+        return $this->is_success($result);
+
+    }
+
+    /**
+     * Upgrade to version 201910124
+     *      - Add `date_created` column
+     *      - Add `date_modified` column
+     *
+     * @return bool
+     */
+    protected function __201910124()
+    {
+
+        $result = $this->column_exists('date_created');
+
+        if (! $result) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD COLUMN date_created datetime NOT NULL DEFAULT '0000-00-00 00:00:00'");
+        }
+
+        $result = $this->column_exists('date_modified');
+
+        if (! $result) {
+            $result = $this->get_db()->query("ALTER TABLE {$this->table_name} ADD COLUMN date_modified datetime NOT NULL DEFAULT '0000-00-00 00:00:00'");
+        }
+
+        return $result;
+
+    }
+
+}
diff --git a/src/Exceptions/Exception.php b/src/Exceptions/Exception.php
new file mode 100644
index 00000000..e2c97814
--- /dev/null
+++ b/src/Exceptions/Exception.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Exception
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Exceptions;
+
+/**
+ * Class Exception
+ *
+ * @package Book_Database
+ * @since 1.3 Namespace changed.
+ */
+class Exception extends \Exception
+{
+
+    protected $error_type = '';
+
+    /**
+     * Exception constructor.
+     *
+     * @param  string  $error_type  Type of error. A non-translated version of the message.
+     * @param  string  $message  Error message.
+     * @param  int  $code_number  Error code.
+     * @param  \Exception|null  $previous
+     */
+    public function __construct(string $error_type, string $message, int $code_number = 0, \Throwable $previous = null)
+    {
+        $this->error_type = $error_type;
+
+        parent::__construct($message, $code_number, $previous);
+    }
+
+    /**
+     * Get the error type
+     *
+     * @return string
+     */
+    public function get_error_type(): string
+    {
+        return $this->error_type;
+    }
+
+}
diff --git a/src/Exceptions/ModelNotFoundException.php b/src/Exceptions/ModelNotFoundException.php
new file mode 100644
index 00000000..8910b192
--- /dev/null
+++ b/src/Exceptions/ModelNotFoundException.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * ModelNotFoundException.php
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ * @since     1.3
+ */
+
+namespace Book_Database\Exceptions;
+
+class ModelNotFoundException extends \Exception
+{
+
+}
diff --git a/src/Helpers/HTML.php b/src/Helpers/HTML.php
new file mode 100644
index 00000000..2a51ff23
--- /dev/null
+++ b/src/Helpers/HTML.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * HTML Helper Class
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Helpers;
+
+use Book_Database\Models\BookTaxonomy;
+use function Book_Database\get_book_taxonomy_by;
+use function Book_Database\get_book_terms;
+
+/**
+ * Class HTML
+ *
+ * @package Book_Database
+ * @since 1.3 Namespace changed.
+ */
+class HTML
+{
+
+    /**
+     * Output a meta row
+     *
+     * @param  array  $args
+     */
+    public function meta_row(array $args = array()): void
+    {
+        $args = wp_parse_args($args, array(
+            'label' => '',
+            'field' => '',
+            'id'    => ''
+        ));
+        ?>
+        <div class="bdb-meta-row">
+            <label for="<?php echo esc_attr($args['id']) ?? ''; ?>"><?php echo esc_html($args['label']); ?></label>
+            <div class="bdb-meta-value">
+                <?php echo $args['field']; ?>
+            </div>
+        </div>
+        <?php
+    }
+
+    /**
+     * Render a taxonomy field according to its setting (checkboxes or text input)
+     *
+     * @param  BookTaxonomy|string  $taxonomy  Taxonomy object or slug.
+     * @param  array  $args  Display arguments.
+     */
+    public function taxonomy_field($taxonomy, array $args = array()): void
+    {
+        $args = wp_parse_args($args, array(
+            'selected' => array(),
+            'number'   => 300,
+            'id'       => ''
+        ));
+
+        if (! $taxonomy instanceof BookTaxonomy) {
+            $taxonomy = get_book_taxonomy_by('slug', $taxonomy);
+        }
+
+        if (! $taxonomy instanceof BookTaxonomy) {
+            return;
+        }
+
+        if ('checkbox' === $taxonomy->get_format()) {
+
+            // "Categories"
+
+            // Get all terms EXCEPT the ones already checked.
+            $all_terms = get_book_terms(array(
+                'number'       => 300,
+                'taxonomy'     => $taxonomy->get_slug(),
+                'name__not_in' => $args['selected'],
+                'fields'       => 'name',
+                'orderby'      => 'name',
+                'order'        => 'ASC'
+            ));
+
+            $final_terms = $args['selected'] + $all_terms;
+            ?>
+            <div id="bdb-checkboxes-<?php echo esc_attr(sanitize_html_class($taxonomy->get_slug().'-'.$args['id'])); ?>" class="bdb-taxonomy-checkboxes" data-taxonomy="<?php echo esc_attr($taxonomy->get_slug()); ?>" data-name="<?php echo esc_attr('book_terms['.$taxonomy->get_slug().'][]'); ?>">
+                <div class="bdb-checkbox-wrap">
+                    <?php
+                    foreach ($final_terms as $term_name) {
+                        ?>
+                        <label for="<?php echo esc_attr(sanitize_html_class(sanitize_key(sprintf('%s-%s-%s',
+                            $taxonomy->get_slug(), $term_name, $args['id'])))); ?>">
+                            <input type="checkbox" id="<?php echo esc_attr(sanitize_html_class(sanitize_key(sprintf('%s-%s-%s',
+                                $taxonomy->get_slug(), $term_name,
+                                $args['id'])))); ?>" class="bdb-checkbox" name="book_terms[<?php echo esc_attr($taxonomy->get_slug()); ?>][]" value="<?php echo esc_attr($term_name); ?>" <?php checked(in_array($term_name,
+                                $args['selected'])); ?>>
+                            <?php echo esc_html($term_name); ?>
+                        </label>
+                        <?php
+                    }
+                    ?>
+                </div>
+                <div class="bdb-new-checkbox-term">
+                    <label for="bdb-new-checkbox-term-<?php echo esc_attr(sanitize_html_class($taxonomy->get_slug())); ?>" class="screen-reader-text"><?php printf(esc_html__('Enter the name of a new %s',
+                            'book-database'), esc_html(lcfirst($taxonomy->get_name()))); ?></label>
+                    <input type="text" id="bdb-new-checkbox-term-<?php echo esc_attr(sanitize_html_class($taxonomy->get_slug())); ?>" class="regular-text bdb-new-checkbox-term-value">
+                    <input type="button" class="button" value="<?php esc_attr_e('Add', 'book-database'); ?>">
+                </div>
+            </div>
+            <?php
+
+        } else {
+
+            // "Tags"
+
+            ?>
+            <div id="bdb-tags-<?php echo esc_attr(sanitize_html_class($taxonomy->get_slug())); ?>" class="bdb-tags-wrap" data-taxonomy="<?php echo esc_attr($taxonomy->get_slug()); ?>">
+                <div class="jaxtag">
+                    <div class="nojs-tags hide-if-js">
+                        <label for="bdb-input-tag-<?php echo esc_attr(sanitize_html_class($taxonomy->get_slug())); ?>"><?php printf(__('Enter the name of the %s',
+                                'book-database'), esc_html($taxonomy->get_name())); ?></label>
+                        <textarea name="book_terms[<?php echo esc_attr($taxonomy->get_slug()); ?>]" rows="3" cols="20" id="bdb-input-tag-<?php echo esc_attr(sanitize_html_class($taxonomy->get_slug())); ?>" data-taxonomy="<?php echo esc_attr($taxonomy->get_slug()); ?>"><?php echo esc_textarea(implode(', ',
+                                $args['selected'])); ?></textarea>
+                    </div>
+                    <div class="bdb-ajaxtag hide-if-no-js">
+                        <p>
+                            <label for="bdb-new-<?php echo esc_attr(sanitize_html_class($taxonomy->get_slug())); ?>-term" class="screen-reader-text"><?php printf(__('Enter the name of the %s',
+                                    'book-database'), esc_html($taxonomy->get_name())); ?></label>
+                            <input type="text" id="bdb-new-<?php echo esc_attr(sanitize_html_class($taxonomy->get_slug())); ?>-term" class="form-input-tip regular-text bdb-new-tag" size="16" autocomplete="off" value="">
+                            <input type="button" class="button" value="<?php esc_attr_e('Add',
+                                'book-database'); ?>" tabindex="3">
+                        </p>
+                    </div>
+                </div>
+                <div class="bdb-tags-checklist"></div>
+            </div>
+            <?php
+        }
+
+    }
+
+}
diff --git a/src/Helpers/Hooks.php b/src/Helpers/Hooks.php
new file mode 100644
index 00000000..4d17485c
--- /dev/null
+++ b/src/Helpers/Hooks.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Hooks.php
+ *
+ * Taken from GiveWP.
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Helpers;
+
+use function Book_Database\book_database;
+
+class Hooks
+{
+
+    /**
+     * Wrapper for `add_action()`. This prevents the need to instantiate the class before
+     * adding it to the hook.
+     *
+     * @since 1.3
+     *
+     * @param  string  $tag
+     * @param  string  $class
+     * @param  string  $method
+     * @param  int  $priority
+     * @param  int  $acceptedArgs
+     */
+    public static function addAction(
+        string $tag,
+        string $class,
+        string $method = '__invoke',
+        int $priority = 10,
+        int $acceptedArgs = 1
+    ) {
+        if (! method_exists($class, $method)) {
+            throw new \InvalidArgumentException("The method $method does not exist on $class.");
+        }
+
+        add_action(
+            $tag,
+            static function () use ($tag, $class, $method) {
+                $instance = book_database($class);
+
+                call_user_func_array([$instance, $method], func_get_args());
+            },
+            $priority,
+            $acceptedArgs
+        );
+    }
+
+    /**
+     * Wrapper for `add_filter()`. This prevents the need to instantiate the class before
+     * adding it to the hook.
+     *
+     * @since 3.7
+     *
+     * @param  string  $tag
+     * @param  string  $class
+     * @param  string  $method
+     * @param  int  $priority
+     * @param  int  $acceptedArgs
+     */
+    public static function addFilter(
+        string $tag,
+        string $class,
+        string $method = '__invoke',
+        int $priority = 10,
+        int $acceptedArgs = 1
+    ) {
+        if (! method_exists($class, $method)) {
+            throw new \InvalidArgumentException("The method $method does not exist on $class.");
+        }
+
+        add_filter(
+            $tag,
+            static function () use ($tag, $class, $method) {
+                $instance = book_database($class);
+
+                return call_user_func_array([$instance, $method], func_get_args());
+            },
+            $priority,
+            $acceptedArgs
+        );
+    }
+
+}
diff --git a/src/Models/Author.php b/src/Models/Author.php
new file mode 100644
index 00000000..01a7f797
--- /dev/null
+++ b/src/Models/Author.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Author Object
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Models;
+
+use Book_Database\Models\Model;
+
+/**
+ * Class Author
+ *
+ * @package Book_Database
+ * @since 1.3 Namespace changed.
+ */
+class Author extends Model
+{
+
+    protected $name = '';
+
+    protected $slug = '';
+
+    protected $description = '';
+
+    protected $image_id = null;
+
+    protected $links = array();
+
+    protected $book_count = 0;
+
+    /**
+     * Get the author's name
+     *
+     * @return string
+     */
+    public function get_name(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get the author slug
+     *
+     * @return string
+     */
+    public function get_slug(): string
+    {
+        return $this->slug;
+    }
+
+    /**
+     * Get the author description
+     *
+     * @return string
+     */
+    public function get_description(): string
+    {
+        return $this->description;
+    }
+
+    /**
+     * Get the ID of the image attachment
+     *
+     * @return int
+     */
+    public function get_image_id(): int
+    {
+        return ! empty($this->image_id) ? absint($this->image_id) : 0;
+    }
+
+    /**
+     * Get the author image URL
+     *
+     * @param  string  $size  Desired image size.
+     *
+     * @return string
+     */
+    public function get_image_url(string $size = 'full'): string
+    {
+
+        $url      = '';
+        $image_id = $this->get_image_id();
+
+        if (! empty($image_id)) {
+            $url = wp_get_attachment_image_url($image_id, $size);
+        }
+
+        return apply_filters('book-database/author/get/image_url', $url, $image_id, $this);
+
+    }
+
+    /**
+     * Get the author image HTML.
+     *
+     * @param  string|array  $size  Desired image size.
+     * @param  array  $args  Arguments to use in `wp_get_attachment_image()`.
+     *
+     * @return string
+     */
+    public function get_image($size = 'full', array $args = array()): string
+    {
+
+        $image    = '';
+        $image_id = $this->get_image_id();
+
+        if ($image_id) {
+            $image = wp_get_attachment_image(absint($image_id), $size, false, $args);
+        }
+
+        return apply_filters('book-database/author/get/image', $image, $image_id, $this);
+
+    }
+
+    /**
+     * Get an array of author links
+     *
+     * @return array()
+     */
+    public function get_links(): array
+    {
+        return $this->links;
+    }
+
+    /**
+     * Get the number of books by this author
+     *
+     * @return int
+     */
+    public function get_book_count(): int
+    {
+        return absint($this->book_count);
+    }
+
+}
diff --git a/src/Models/Book.php b/src/Models/Book.php
new file mode 100644
index 00000000..a73228e7
--- /dev/null
+++ b/src/Models/Book.php
@@ -0,0 +1,375 @@
+<?php
+/**
+ * Book
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Models;
+
+use Book_Database\Models\BookLink;
+use Book_Database\Models\Series;
+use function Book_Database\book_database;
+use function Book_Database\get_attached_book_authors;
+use function Book_Database\get_attached_book_terms;
+use function Book_Database\get_book_links;
+use function Book_Database\get_book_series_by;
+use function Book_Database\get_book_taxonomies;
+
+/**
+ * Class Book
+ *
+ * @package Book_Database
+ * @since 1.3 Namespace changed.
+ */
+class Book extends Model
+{
+
+    protected $cover_id = 0;
+
+    protected $title = '';
+
+    protected $index_title = '';
+
+    protected $authors;
+
+    protected $series_id = null;
+
+    protected $series_position = null;
+
+    protected $pub_date = '';
+
+    protected $pages = 0;
+
+    protected $synopsis = '';
+
+    protected $goodreads_url = '';
+
+    protected $links;
+
+    /**
+     * Get the attachment ID for the cover image
+     *
+     * @return int
+     */
+    public function get_cover_id(): int
+    {
+        return absint($this->cover_id);
+    }
+
+    /**
+     * Get the cover image URL
+     *
+     * @param  string  $size  Desired image size.
+     *
+     * @return string
+     */
+    public function get_cover_url(string $size = 'full'): string
+    {
+
+        $url      = '';
+        $cover_id = $this->get_cover_id();
+
+        if (! empty($cover_id)) {
+            $url = wp_get_attachment_image_url($cover_id, $size);
+        }
+
+        return apply_filters('book-database/book/get/cover_url', $url, $cover_id, $this);
+
+    }
+
+    /**
+     * Get the cover image HTML.
+     *
+     * @param  string|array  $size  Desired image size.
+     * @param  array  $args  Arguments to use in `wp_get_attachment_image()`.
+     *
+     * @return string
+     */
+    public function get_cover($size = 'full', array $args = array()): string
+    {
+
+        $image    = '';
+        $cover_id = $this->get_cover_id();
+
+        if ($cover_id) {
+            $image = wp_get_attachment_image(absint($cover_id), $size, false, $args);
+        }
+
+        return apply_filters('book-database/book/get/cover', $image, $cover_id, $this);
+
+    }
+
+    /**
+     * Get the title of the book
+     *
+     * @return string
+     */
+    public function get_title(): string
+    {
+        return $this->title;
+    }
+
+    /**
+     * Get the index-friendly title
+     *
+     * This moves "The", "An", and "A" to the end of the title. Example:
+     * `Binding, The`
+     *
+     * @return string
+     */
+    public function get_index_title(): string
+    {
+        return $this->index_title;
+    }
+
+    /**
+     * Get the authors of the book
+     *
+     * This returns an array of `Author` objects.
+     *
+     * @param  array  $args  Query args to override the defaults.
+     *
+     * @return Author[]|array
+     */
+    public function get_authors(array $args = array()): array
+    {
+
+        if (! isset($this->authors)) {
+            $this->authors = get_attached_book_authors($this->get_id(), $args);
+        }
+
+        return $this->authors;
+
+    }
+
+    /**
+     * Get the author names
+     *
+     * @param  bool  $implode  True to return a comma-separated list, false to return an array.
+     *
+     * @return array|string
+     */
+    public function get_author_names(bool $implode = false)
+    {
+
+        $author_names = array();
+        $author_terms = $this->get_authors();
+
+        if ($author_terms) {
+            foreach ($author_terms as $author_term) {
+                $author_names[] = $author_term->get_name();
+            }
+        }
+
+        if ($implode) {
+            $author_names = implode(', ', $author_names);
+        }
+
+        return $author_names;
+
+    }
+
+    /**
+     * Get the ID of the series this book is in
+     *
+     * @return int|null
+     */
+    public function get_series_id(): ?int
+    {
+        return ! empty($this->series_id) ? absint($this->series_id) : null;
+    }
+
+    /**
+     * Get the position in the series
+     *
+     * @return int|float|null
+     */
+    public function get_series_position()
+    {
+        return $this->series_position ?? null;
+    }
+
+    /**
+     * Get the name of the series
+     *
+     * @return string|false Series name on success, false on failure.
+     */
+    public function get_series_name()
+    {
+
+        $series = get_book_series_by('id', $this->get_series_id());
+
+        if ($series instanceof Series) {
+            return $series->get_name();
+        }
+
+        return false;
+
+    }
+
+    /**
+     * Get the book's publication date
+     *
+     * @param  bool  $formatted  Whether or not to format the result for display.
+     *                          Unlike other dates, this DOES NOT convert the date
+     *                          to local time. We keep it in UTC always.
+     * @param  string  $format  Format to display in. Defaults to site format.
+     *
+     * @return string|null
+     */
+    public function get_pub_date(bool $formatted = false, string $format = ''): ?string
+    {
+
+        if (empty($this->pub_date) || ! $formatted) {
+            return $this->pub_date;
+        }
+
+        $format = ! empty($format) ? $format : get_option('date_format');
+
+        return date($format, strtotime($this->pub_date));
+
+    }
+
+    /**
+     * Get the number of pages in the book
+     *
+     * @return int|null
+     */
+    public function get_pages(): ?int
+    {
+        return ! empty($this->pages) ? absint($this->pages) : null;
+    }
+
+    /**
+     * Get the synopsis
+     *
+     * @return string
+     */
+    public function get_synopsis(): string
+    {
+        return $this->synopsis;
+    }
+
+    /**
+     * Get the Goodreads URL
+     *
+     * @return string
+     */
+    public function get_goodreads_url(): string
+    {
+        return $this->goodreads_url;
+    }
+
+    /**
+     * Get the links associated with this book
+     *
+     * @return BookLink[]
+     */
+    public function get_links(): array
+    {
+
+        if (! isset($this->links)) {
+            $this->links = get_book_links(array(
+                'book_id' => $this->get_id(),
+                'number'  => 30
+            ));
+        }
+
+        return $this->links;
+
+    }
+
+    /**
+     * Get the average rating from all reading logs associated with this book
+     *
+     * @return int|float|null
+     */
+    public function get_average_rating()
+    {
+        global $wpdb;
+
+        $log_table = book_database()->get_table('reading_log')->get_table_name();
+
+        $query   = $wpdb->prepare("SELECT ROUND( AVG( rating ), 2 ) FROM {$log_table} WHERE book_id = %d AND rating IS NOT NULL",
+            $this->get_id());
+        $average = $wpdb->get_var($query);
+
+        /**
+         * Filters the average rating for a book.
+         *
+         * @param  int|float|null  $average  Average rating.
+         * @param  int  $book_id  ID of the book.
+         * @param  Book  $this  Book object.
+         */
+        return apply_filters('book-database/book/get/average-rating', $average, $this->get_id(), $this);
+    }
+
+    /**
+     * Whether or not the book has a term attached.
+     *
+     * @param  string|int  $term_name_or_id  Term name or ID.
+     * @param  string  $taxonomy  Taxonomy slug.
+     *
+     * @return bool
+     */
+    public function has_term($term_name_or_id, string $taxonomy): bool
+    {
+        $args = array();
+
+        if (is_numeric($term_name_or_id)) {
+            $args['fields'] = 'id';
+        } else {
+            $args['fields'] = 'name';
+        }
+
+        $terms = get_attached_book_terms($this->get_id(), $taxonomy, $args);
+
+        return in_array($term_name_or_id, $terms);
+    }
+
+    /**
+     * Returns all data associated with a book
+     *
+     * @return array
+     */
+    public function get_data(): array
+    {
+        $data = array(
+            'id'              => $this->get_id(),
+            'cover_id'        => $this->get_cover_id(),
+            'cover_url'       => $this->get_cover_url('full'),
+            'title'           => $this->get_title(),
+            'index_title'     => $this->get_index_title(),
+            'authors'         => $this->get_authors(),
+            'series_id'       => $this->get_series_id(),
+            'series_name'     => $this->get_series_name(),
+            'series_position' => $this->get_series_position(),
+            'pub_date'        => $this->get_pub_date(),
+            'pages'           => $this->get_pages(),
+            'synopsis'        => $this->get_synopsis(),
+            'goodreads_url'   => $this->get_goodreads_url(),
+            'links'           => $this->get_links(),
+            'terms'           => array(),
+            'date_created'    => $this->get_date_created(),
+            'date_modified'   => $this->get_date_modified()
+        );
+
+        // Attach all terms.
+        foreach (get_book_taxonomies(array('field' => 'slug')) as $taxonomy) {
+            $data['terms'][$taxonomy] = get_attached_book_terms($this->get_id(), $taxonomy);
+        }
+
+        /**
+         * Filters the data.
+         *
+         * @param  array  $data
+         * @param  int  $book_id
+         * @param  Book  $this
+         */
+        return apply_filters('book-database/book/get/data', $data, $this->get_id(), $this);
+    }
+
+}
diff --git a/src/Models/BookAuthorRelationship.php b/src/Models/BookAuthorRelationship.php
new file mode 100644
index 00000000..f58f1d01
--- /dev/null
+++ b/src/Models/BookAuthorRelationship.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Book Author Relationship Object
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Models;
+
+/**
+ * Class BookAuthorRelationship
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookAuthorRelationship extends Model
+{
+
+    protected $author_id = 0;
+
+    protected $book_id = 0;
+
+    /**
+     * Get the author ID
+     *
+     * @return int
+     */
+    public function get_author_id(): int
+    {
+        return absint($this->author_id);
+    }
+
+    /**
+     * Get the book ID
+     *
+     * @return int
+     */
+    public function get_book_id(): int
+    {
+        return absint($this->book_id);
+    }
+
+}
diff --git a/src/Models/BookLink.php b/src/Models/BookLink.php
new file mode 100644
index 00000000..94df846a
--- /dev/null
+++ b/src/Models/BookLink.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Book Link Object
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Models;
+
+use Book_Database\Models\Retailer;
+use function Book_Database\get_retailer;
+
+/**
+ * Class BookLink
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookLink extends Model
+{
+
+    /**
+     * @var int ID of the associated book.
+     */
+    protected $book_id = 0;
+
+    /**
+     * @var int ID of the retailer.
+     */
+    protected $retailer_id = 0;
+
+    /**
+     * @var string
+     */
+    protected $url = '';
+
+    /**
+     * Get the ID of the associated book.
+     *
+     * @return int
+     */
+    public function get_book_id(): int
+    {
+        return absint($this->book_id);
+    }
+
+    /**
+     * Get the ID of the retailer
+     *
+     * @return int
+     */
+    public function get_retailer_id(): int
+    {
+        return absint($this->retailer_id);
+    }
+
+    /**
+     * Get the URL
+     *
+     * @return string
+     */
+    public function get_url(): string
+    {
+        return $this->url;
+    }
+
+    /**
+     * Format the book link
+     *
+     * @return string
+     */
+    public function format(): string
+    {
+        $retailer = get_retailer($this->get_retailer_id());
+
+        if ($retailer instanceof Retailer) {
+            $html = $retailer->build_link($this->get_url());
+        } else {
+            $html = make_clickable($this->get_url());
+        }
+
+        /**
+         * Filters the formatted book link
+         *
+         * @param  string  $html  Final HTML to be displayed in the book layout.
+         * @param  Retailer  $retailer  Retailer object.
+         * @param  BookLink  $this  Book link object.
+         */
+        return apply_filters('book-database/book-link/format', $html, $retailer, $this);
+    }
+
+}
diff --git a/src/Models/BookTaxonomy.php b/src/Models/BookTaxonomy.php
new file mode 100644
index 00000000..67d4358c
--- /dev/null
+++ b/src/Models/BookTaxonomy.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Book Taxonomy Object
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Models;
+
+/**
+ * Class BookTaxonomy
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookTaxonomy extends Model
+{
+
+    protected $name = '';
+
+    protected $slug = '';
+
+    protected $format = 'text';
+
+    /**
+     * Get the name
+     *
+     * @return string
+     */
+    public function get_name(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get the slug
+     *
+     * @return string
+     */
+    public function get_slug(): string
+    {
+        return $this->slug;
+    }
+
+    /**
+     * Get the format - either `text` or `checkbox`
+     *
+     * @return string
+     */
+    public function get_format(): string
+    {
+        return $this->format;
+    }
+
+}
diff --git a/src/Models/BookTerm.php b/src/Models/BookTerm.php
new file mode 100644
index 00000000..e87b9fb1
--- /dev/null
+++ b/src/Models/BookTerm.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Book Term
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Models;
+
+use Book_Database\Models\Model;
+use function absint;
+
+/**
+ * Class BookTerm
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookTerm extends Model
+{
+
+    protected $taxonomy = '';
+
+    protected $name = '';
+
+    protected $slug = '';
+
+    protected $description = '';
+
+    protected $image_id = 0;
+
+    protected $links = '';
+
+    protected $book_count = 0;
+
+    /**
+     * Get the taxonomy slug
+     *
+     * @return string
+     */
+    public function get_taxonomy(): string
+    {
+        return $this->taxonomy;
+    }
+
+    /**
+     * Get the name of the term
+     *
+     * @return string
+     */
+    public function get_name(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get the term slug
+     *
+     * @return string
+     */
+    public function get_slug(): string
+    {
+        return $this->slug;
+    }
+
+    /**
+     * Get the description
+     *
+     * @return string
+     */
+    public function get_description(): string
+    {
+        return $this->description;
+    }
+
+    /**
+     * Get the ID of the image attachment
+     *
+     * @return int
+     */
+    public function get_image_id(): int
+    {
+        return absint($this->image_id);
+    }
+
+    /**
+     * Get the term links
+     *
+     * @return string
+     */
+    public function get_links(): array
+    {
+        return $this->links;
+    }
+
+    /**
+     * Get the number of books associated with this term
+     *
+     * @return int
+     */
+    public function get_book_count(): int
+    {
+        return absint($this->book_count);
+    }
+
+}
diff --git a/src/Models/BookTermRelationship.php b/src/Models/BookTermRelationship.php
new file mode 100644
index 00000000..e9429b9e
--- /dev/null
+++ b/src/Models/BookTermRelationship.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Book Term Relationship Object
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Models;
+
+/**
+ * Class BookTermRelationship
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class BookTermRelationship extends Model
+{
+
+    protected $term_id = 0;
+
+    protected $book_id = 0;
+
+    /**
+     * Get the term ID
+     *
+     * @return int
+     */
+    public function get_term_id(): int
+    {
+        return absint($this->term_id);
+    }
+
+    /**
+     * Get the book ID
+     *
+     * @return int
+     */
+    public function get_book_id(): int
+    {
+        return absint($this->book_id);
+    }
+
+}
diff --git a/src/Models/Edition.php b/src/Models/Edition.php
new file mode 100644
index 00000000..9c090dae
--- /dev/null
+++ b/src/Models/Edition.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Edition Object
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Models;
+
+use function Book_Database\format_date;
+use function Book_Database\get_book_formats;
+use function Book_Database\get_book_term;
+
+/**
+ * Class Edition
+ *
+ * @package Book_Database
+ * @since 1.3 Namespace changed.
+ */
+class Edition extends Model
+{
+
+    protected $book_id = 0;
+
+    protected $isbn = '';
+
+    protected $format = '';
+
+    protected $date_acquired = null;
+
+    protected $source_id = null;
+
+    protected $signed = null;
+
+    /**
+     * Get the ID of the book
+     *
+     * @return int
+     */
+    public function get_book_id(): int
+    {
+        return absint($this->book_id);
+    }
+
+    /**
+     * Get the ISBN
+     *
+     * @return string
+     */
+    public function get_isbn(): string
+    {
+        return $this->isbn;
+    }
+
+    /**
+     * Get the format (ebook, hardback, etc.)
+     *
+     * @return string
+     */
+    public function get_format(): string
+    {
+        return $this->format;
+    }
+
+    /**
+     * Get the date the book was acquired
+     *
+     * @param  bool  $formatted  Whether or not to format the date for display.
+     * @param  string  $format  Format to display the formatted date in. Default to site format.
+     *
+     * @return string|null
+     */
+    public function get_date_acquired(bool $formatted = false, string $format = ''): ?string
+    {
+        return (! empty($this->date_acquired) && $formatted)
+            ? format_date($this->date_acquired, $format)
+            : $this->date_acquired;
+    }
+
+    /**
+     * Get the ID of the source term
+     *
+     * @return int|null
+     */
+    public function get_source_id(): ?int
+    {
+        return ! empty($this->source_id) ? absint($this->source_id) : null;
+    }
+
+    /**
+     * Whether or not the book is signed
+     *
+     * @return bool
+     */
+    public function is_signed(): bool
+    {
+        return ! empty($this->signed);
+    }
+
+    /**
+     * Export properties
+     *
+     * @return array
+     */
+    public function export_vars(): array
+    {
+        $vars                = parent::export_vars();
+        $vars['format_name'] = get_book_formats()[$this->get_format()] ?? '';
+
+        if ($this->get_source_id()) {
+            $source = get_book_term($this->get_source_id());
+
+            if ($source instanceof BookTerm) {
+                $vars['source_name'] = $source->get_name();
+            }
+        }
+
+        return $vars;
+    }
+
+}
diff --git a/src/Models/Model.php b/src/Models/Model.php
new file mode 100644
index 00000000..9db0254a
--- /dev/null
+++ b/src/Models/Model.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Base Object
+ *
+ * Extended by core objects.
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Models;
+
+use Book_Database\Traits\HasQueryInterface;
+use function Book_Database\format_date;
+
+/**
+ * Class Model
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+abstract class Model
+{
+    use HasQueryInterface;
+
+    public $id = 0;
+
+    public $date_created = '';
+
+    public $date_modified = '';
+
+    /**
+     * Object constructor
+     *
+     * @param  array|object  $args  Object to populate vars for.
+     */
+    public function __construct($args = array())
+    {
+        $this->set_vars($args);
+    }
+
+    /**
+     * Set class properties from arguments
+     *
+     * @param  array  $args
+     */
+    protected function set_vars($args = array())
+    {
+        // Bail if empty.
+        if (empty($args)) {
+            return;
+        }
+
+        // Cast to an array.
+        if (! is_array($args)) {
+            $args = (array) $args;
+        }
+
+        foreach ($args as $key => $value) {
+            if ('0000-00-00 00:00:00' === $value) {
+                $value = null;
+            }
+
+            $this->{$key} = $value;
+        }
+    }
+
+    /**
+     * Get the ID
+     *
+     * @return int
+     */
+    public function get_id(): int
+    {
+        return absint($this->id);
+    }
+
+    /**
+     * Get the created date
+     *
+     * @param  bool  $formatted  Whether or not to format the result for display.
+     * @param  string  $format  Format to display in. Defaults to site format.
+     *
+     * @return string
+     */
+    public function get_date_created(bool $formatted, string $format = ''): string
+    {
+        return (! empty($this->date_created) && $formatted)
+            ? format_date($this->date_created, $format)
+            : $this->date_created;
+    }
+
+    /**
+     * Get the modified date
+     *
+     * @param  bool  $formatted  Whether or not to format the result for display.
+     * @param  string  $format  Format to display in. Defaults to site format.
+     *
+     * @return string
+     */
+    public function get_date_modified(bool $formatted = false, string $format = ''): string
+    {
+        return (! empty($this->date_modified) && $formatted)
+            ? format_date($this->date_modified, $format)
+            : $this->date_modified;
+    }
+
+    /**
+     * Get all object properties as an array
+     *
+     * @return array
+     */
+    public function export_vars(): array
+    {
+        return get_object_vars($this);
+    }
+
+}
diff --git a/src/Models/ReadingLog.php b/src/Models/ReadingLog.php
new file mode 100644
index 00000000..737df9ae
--- /dev/null
+++ b/src/Models/ReadingLog.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * Reading Log Object
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Models;
+
+use Book_Database\Models\Edition;
+use Book_Database\Models\Review;
+use function Book_Database\format_date;
+use function Book_Database\get_book;
+use function Book_Database\get_edition;
+use function Book_Database\get_review_by;
+
+/**
+ * Class ReadingLog
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class ReadingLog extends Model
+{
+
+    protected $book_id = 0;
+
+    protected $edition_id = null;
+
+    protected $user_id = 0;
+
+    protected $date_started = '';
+
+    protected $date_finished = '';
+
+    protected $percentage_complete = 0;
+
+    protected $rating = null;
+
+    /**
+     * Get the ID of the associated book
+     *
+     * @return int
+     */
+    public function get_book_id(): int
+    {
+        return absint($this->book_id);
+    }
+
+    /**
+     * Get the ID of the associated edition
+     *
+     * @return int|null
+     */
+    public function get_edition_id(): ?int
+    {
+        return ! empty($this->edition_id) ? absint($this->edition_id) : null;
+    }
+
+    /**
+     * Get the ID of the user who made this entry
+     *
+     * @return int
+     */
+    public function get_user_id(): int
+    {
+        return absint($this->user_id);
+    }
+
+    /**
+     * Get the date the user started reading
+     *
+     * @param  bool  $formatted  Whether or not to format the result for display.
+     * @param  string  $format  Format to display in. Defaults to site format.
+     *
+     * @return string
+     */
+    public function get_date_started(bool $formatted = false, string $format = ''): string
+    {
+        return (! empty($this->date_started) && $formatted)
+            ? format_date($this->date_started, $format)
+            : $this->date_started;
+    }
+
+    /**
+     * Get the date the user finished reading
+     *
+     * @param  bool  $formatted  Whether or not to format the result for display.
+     * @param  string  $format  Format to display in. Defaults to site format.
+     *
+     * @return string|null
+     */
+    public function get_date_finished(bool $formatted = false, string $format = ''): ?string
+    {
+        return (! empty($this->date_finished) && $formatted)
+            ? format_date($this->date_finished, $format)
+            : $this->date_finished;
+    }
+
+    /**
+     * Get the percentage complete
+     *
+     * Note: This is the `percentage_complete` value multiplied by 100.
+     *
+     * @return float|int
+     */
+    public function get_percentage_complete()
+    {
+        $percentage = floatval($this->percentage_complete);
+
+        if ($percentage >= 1) {
+            $percentage = 1;
+        } elseif ($percentage <= 0) {
+            $percentage = 0;
+        }
+
+        return round($percentage * 100, 2);
+    }
+
+    /**
+     * Whether or not the book has been fully read
+     *
+     * @return bool
+     */
+    public function is_complete(): bool
+    {
+        return $this->get_percentage_complete() >= 100;
+    }
+
+    /**
+     * A book is "DNF" (didn't finish) if there's a finished date but the percentage is less than 100%.
+     *
+     * @return bool
+     */
+    public function is_dnf(): bool
+    {
+        return ! empty($this->get_date_finished()) && ! $this->is_complete();
+    }
+
+    /**
+     * Get the rating
+     *
+     * @return float|null
+     */
+    public function get_rating()
+    {
+        return $this->rating;
+    }
+
+    /**
+     * Export vars
+     *
+     * @return array
+     */
+    public function export_vars(): array
+    {
+
+        $vars = parent::export_vars();
+
+        $vars['is_complete'] = $this->is_complete();
+        $vars['is_dnf']      = $this->is_dnf();
+
+        // Get the edition.
+        $edition         = $this->get_edition_id() ? get_edition($this->get_edition_id()) : null;
+        $vars['edition'] = $edition instanceof Edition ? $edition->export_vars() : null;
+
+        // Get the review ID.
+        $review = get_review_by('reading_log_id', $this->get_id());
+        if ($review instanceof Review) {
+            $vars['review_id'] = $review->get_id();
+        }
+
+        // Calculate the page number we're on.
+        $vars['page']      = 0;
+        $vars['max_pages'] = 0;
+        $book              = get_book($this->get_book_id());
+        if ($book instanceof Book) {
+            $percentage        = $this->get_percentage_complete() / 100;
+            $vars['page']      = round($percentage * $book->get_pages());
+            $vars['max_pages'] = $book->get_pages();
+        }
+
+        return $vars;
+
+    }
+
+}
diff --git a/src/Models/Retailer.php b/src/Models/Retailer.php
new file mode 100644
index 00000000..2aa1fa17
--- /dev/null
+++ b/src/Models/Retailer.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Retailer Object
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Models;
+
+use function esc_html;
+
+/**
+ * Class Retailer
+ *
+ * @package Book_Database
+ * @since 1.3 Namespace changed.
+ */
+class Retailer extends Model
+{
+
+    /**
+     * @var string Name of the retailer
+     */
+    protected $name = '';
+
+    /**
+     * @var string Template, for use in the book layout
+     */
+    protected $template = '';
+
+    /**
+     * Get the name of the retailer
+     *
+     * @return string
+     */
+    public function get_name(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get the template
+     *
+     * @return string
+     */
+    public function get_template(): string
+    {
+        return $this->template;
+    }
+
+    /**
+     * Build a link
+     *
+     * This injects the provided URL into the template, replacing the `[url]` placeholder.
+     *
+     * @param  string  $url
+     *
+     * @return string
+     */
+    public function build_link(string $url): string
+    {
+
+        $template = $this->get_template();
+
+        if (empty($template)) {
+            $template = '<a href="[url]" target="_blank">'.esc_html($this->get_name()).'</a>';
+        }
+
+        return str_replace('[url]', esc_url($url), $template);
+
+    }
+
+}
diff --git a/src/Models/Review.php b/src/Models/Review.php
new file mode 100644
index 00000000..60a8fe5f
--- /dev/null
+++ b/src/Models/Review.php
@@ -0,0 +1,289 @@
+<?php
+/**
+ * Review Object
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Models;
+
+use Book_Database\Database\Reviews\ReviewsQuery;
+use Book_Database\Exceptions\Exception;
+use function Book_Database\book_database;
+use function Book_Database\format_date;
+
+/**
+ * Class Review
+ *
+ * @method static ReviewsQuery getQueryInterface()
+ *
+ * @package Book_Database
+ * @since 1.3 Namespace changed.
+ */
+class Review extends Model
+{
+    protected static $queryInterfaceClass = ReviewsQuery::class;
+
+    /**
+     * @var int ID of the associated book.
+     */
+    protected $book_id = 0;
+
+    /**
+     * @var int ID of the associated reading log.
+     */
+    protected $reading_log_id = 0;
+
+    /**
+     * @var int ID of the user who wrote the review.
+     */
+    protected $user_id = 0;
+
+    /**
+     * @var int|null ID of the associated blog post.
+     */
+    protected $post_id = null;
+
+    /**
+     * @var string External URL to the review.
+     */
+    protected $url = '';
+
+    /**
+     * @var string Review content.
+     */
+    protected $review = '';
+
+    /**
+     * @var string Date the review was written.
+     */
+    protected $date_written = '';
+
+    /**
+     * @var string|null Date the review was published.
+     */
+    protected $date_published = null;
+
+    public static function create(array $args): int
+    {
+        $args = wp_parse_args($args, array(
+            'book_id'        => 0,
+            'reading_log_id' => null,
+            'user_id'        => get_current_user_id(),
+            'post_id'        => null,
+            'url'            => '',
+            'review'         => '',
+            'date_written'   => current_time('mysql', true),
+            'date_published' => null,
+        ));
+
+        if (empty($args['book_id'])) {
+            throw new Exception(
+                'missing_parameter',
+                __('Book ID is required.', 'book-database'),
+                400
+            );
+        }
+
+        return parent::create($args);
+    }
+
+    public static function delete(int $id): void
+    {
+        parent::delete($id);
+
+        // Delete all review meta.
+        global $wpdb;
+        $tbl_meta = book_database()->get_table( 'review_meta' )->get_table_name();
+        $query    = $wpdb->prepare( "DELETE FROM {$tbl_meta} WHERE bdb_review_id = %d", $id );
+        $wpdb->query( $query );
+    }
+
+    /**
+     * Get the ID of the book
+     *
+     * @return int
+     */
+    public function get_book_id(): int
+    {
+        return absint($this->book_id);
+    }
+
+    /**
+     * Get the ID of the user who wrote the review
+     *
+     * @return int|null
+     */
+    public function get_reading_log_id(): ?int
+    {
+        return is_null($this->reading_log_id) ? null : absint($this->reading_log_id);
+    }
+
+    /**
+     * Get the ID of the user who wrote the review
+     *
+     * @return int
+     */
+    public function get_user_id(): int
+    {
+        return absint($this->user_id);
+    }
+
+    /**
+     * Get the ID of the corresponding post
+     *
+     * This is the post the review was published on. This will only be filled out if the
+     * review was published as a blog post on this site.
+     *
+     * @return int|null
+     */
+    public function get_post_id(): ?int
+    {
+        return is_null($this->post_id) ? null : absint($this->post_id);
+    }
+
+    /**
+     * Get the URL of the review
+     *
+     * This will only be filled out if the review is external.
+     *
+     * @return string
+     */
+    public function get_url(): string
+    {
+        return $this->url;
+    }
+
+    /**
+     * Whether or not this is an external review
+     *
+     * Will return true if `url` is filled out.
+     *
+     * @return bool
+     */
+    public function is_external(): bool
+    {
+        return ! empty($this->get_url());
+    }
+
+    /**
+     * Get the review text
+     *
+     * @return string
+     */
+    public function get_review(): string
+    {
+        return $this->review;
+    }
+
+    /**
+     * Get the date the review was written
+     *
+     * @param  bool  $formatted  Whether or not to format the result for display.
+     * @param  string  $format  Format to display in. Defaults to site format.
+     *
+     * @return string
+     */
+    public function get_date_written(bool $formatted = false, string $format = ''): string
+    {
+        return (! empty($this->date_written) && $formatted)
+            ? format_date($this->date_written, $format)
+            : $this->date_written;
+    }
+
+    /**
+     * Get the date the review was (or will be) published
+     *
+     * @param  bool  $formatted  Whether or not to format the result for display.
+     * @param  string  $format  Format to display in. Defaults to site format.
+     *
+     * @return string|null
+     */
+    public function get_date_published(bool $formatted = false, string $format = ''): ?string
+    {
+        return (! empty($this->date_published) && $formatted)
+            ? format_date($this->date_published, $format)
+            : $this->date_published;
+    }
+
+    /**
+     * Get the review permalink
+     *
+     * Returns the URL to the external review if provided, otherwise the URL to the post where
+     * the review is located. Returns false if all else fails.
+     *
+     * @param  bool  $use_id  Whether or not to build the URL with the post ID (ugly permalinks).
+     * @param  bool  $id_appended  Whether or not to includle a "skip-to" the book ID.
+     *
+     * @return string|false
+     */
+    public function get_permalink(bool $use_id = true, bool $id_appended = true)
+    {
+        $url = false;
+
+        if ($this->is_external()) {
+            $url = $this->get_url();
+        } elseif ($this->get_post_id() && $use_id) {
+            $url = add_query_arg(array('p' => urlencode($this->get_post_id())), home_url('/'));
+        } elseif ($this->get_post_id()) {
+            $url = get_permalink($this->get_post_id());
+        }
+
+        if ($id_appended && ! empty($url) && ! $this->is_external()) {
+            $url .= '#book-'.urlencode($this->get_book_id());
+        }
+
+        /**
+         * Filters the review permalink.
+         *
+         * @param  string|false  $url  URL to the review.
+         * @param  bool  $use_id  Whether or not to build the URL with the post ID (ugly permalinks).
+         * @param  bool  $id_appended  Whether or not to includle a "skip-to" the book ID.
+         * @param  Review  $this  Review object.
+         */
+        return apply_filters('book-database/review/get/permalink', $url, $use_id, $id_appended, $this);
+    }
+
+    /**
+     * Whether or not the review has been published
+     *
+     * Returns `true` if the review is external, or if the review published date is in the past.
+     * Returns `false` f the review is associated with a post and that post is not "published".
+     *
+     * @return bool
+     */
+    public function is_published(): bool
+    {
+        if ($this->is_external()) {
+            return true;
+        }
+
+        if ($this->get_post_id()) {
+            $post = get_post($this->get_post_id());
+
+            if ($post instanceof \WP_Post && 'publish' !== $post->post_status) {
+                return false;
+            }
+        }
+
+        return ($this->get_date_published(true, 'U') <= current_time('timestamp'));
+    }
+
+    /**
+     * Queries for reviews.
+     *
+     * @since 1.3
+     *
+     * @param  array  $args
+     *
+     * @return Review[]|array
+     * @throws \Exception
+     */
+    public static function query(array $args = []): array
+    {
+        return static::getQueryInterface()->get_reviews($args);
+    }
+
+}
diff --git a/src/Models/Series.php b/src/Models/Series.php
new file mode 100644
index 00000000..951d1032
--- /dev/null
+++ b/src/Models/Series.php
@@ -0,0 +1,218 @@
+<?php
+/**
+ * Series Object
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\Models;
+
+use Book_Database\Database\Series\SeriesQuery;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Exceptions\ModelNotFoundException;
+use function Book_Database\book_database;
+use function Book_Database\count_books;
+use function Book_Database\get_books;
+use function Book_Database\unique_book_slug;
+use function Book_Database\update_book;
+
+/**
+ * Class Series
+ *
+ * @package Book_Database
+ * @since 1.3 Namespace changed.
+ */
+class Series extends Model
+{
+    protected static $queryInterfaceClass = SeriesQuery::class;
+
+    protected $name = '';
+
+    protected $slug = '';
+
+    protected $description = '';
+
+    protected $number_books = 0;
+
+    public static function create(array $args): int
+    {
+        $args = wp_parse_args($args, array(
+            'name'         => '',
+            'slug'         => '',
+            'description'  => '',
+            'number_books' => 1,
+        ));
+
+        if (empty($args['name'])) {
+            throw new Exception('missing_required_parameter', __('A taxonomy name is required.', 'book-database'), 400);
+        }
+
+        // Generate a slug.
+        $args['slug'] = ! empty($args['slug'])
+            ? unique_book_slug($args['slug'], 'series')
+            : unique_book_slug(sanitize_title($args['name']), 'series');
+
+        // Sanitize.
+        $args['slug'] = sanitize_key($args['slug']);
+
+        return parent::create($args);
+    }
+
+    public static function update(int $id, array $args): bool
+    {
+        try {
+            /** @var Series $series */
+            $series = static::find($id);
+        } catch (ModelNotFoundException $e) {
+            throw new Exception('invalid_id', __('Invalid series ID.', 'book-database'), 400);
+        }
+
+        // If the slug is changing, let's re-generate it.
+        if (isset($args['slug']) && $args['slug'] !== $series->get_slug()) {
+            $args['slug'] = unique_book_slug($args['slug'], 'series');
+        }
+
+        return parent::update($id, $args);
+    }
+
+    public static function delete(int $id): void
+    {
+        parent::delete($id);
+
+        // Get all the books in this series.
+        $books = get_books(array(
+            'series_id' => absint($id),
+            'number'    => 9999,
+            'fields'    => 'id'
+        ));
+
+        if ($books) {
+            /**
+             * @var int[] $books
+             */
+            // Remove series_id and series_position from each book.
+            foreach ($books as $book_id) {
+                update_book($book_id, array(
+                    'series_id'       => 0,
+                    'series_position' => null
+                ));
+            }
+        }
+    }
+
+    /**
+     * Get the name of the series
+     *
+     * @return string
+     */
+    public function get_name(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get the series slug
+     *
+     * @return string
+     */
+    public function get_slug(): string
+    {
+        return $this->slug;
+    }
+
+    /**
+     * Get the series description
+     *
+     * @return string
+     */
+    public function get_description(): string
+    {
+        return $this->description;
+    }
+
+    /**
+     * Get the number of books in the series
+     *
+     * Note: This is not the number of books present in the database with this series, but
+     * rather the number of books PLANNED to be in the series. So if the series is a trilogy
+     * but there's only one book in the database, this would return `3` because there are 3
+     * books planned in the series. It's the length of the series.
+     *
+     * @return int
+     */
+    public function get_number_books(): int
+    {
+        if (empty($this->number_books)) {
+            $this->number_books = count_books(array('series_id' => $this->get_id()));
+        }
+
+        return absint($this->number_books);
+    }
+
+    /**
+     * Get the number of books in this series that have been read
+     *
+     * @return int
+     */
+    public function get_number_books_read(): int
+    {
+        global $wpdb;
+
+        $log_table  = book_database()->get_table('reading_log')->get_table_name();
+        $book_table = book_database()->get_table('books')->get_table_name();
+
+        $query       = $wpdb->prepare(
+            "SELECT COUNT( DISTINCT book_id )
+				FROM {$log_table} log
+			    INNER JOIN {$book_table} b ON log.book_id = b.id
+			WHERE series_id = %d
+			  AND date_finished IS NOT NULL
+			  AND user_id = %d",
+            $this->get_id(),
+            get_current_user_id()
+        );
+        $number_read = $wpdb->get_var($query);
+
+        return absint($number_read);
+    }
+
+    /**
+     * Get the books in this series
+     *
+     * @param  array  $args
+     *
+     * @return Book[]
+     */
+    public function get_books_in_series(array $args = array()): array
+    {
+        $args = wp_parse_args($args, array(
+            'series_id' => $this->get_id(),
+            'number'    => 50,
+            'orderby'   => 'series_position',
+            'order'     => 'ASC'
+        ));
+
+        return get_books($args);
+    }
+
+    /**
+     * Get the average rating of all books in this series
+     */
+    public function get_average_rating(): float
+    {
+        global $wpdb;
+
+        $log_table  = book_database()->get_table('reading_log')->get_table_name();
+        $book_table = book_database()->get_table('books')->get_table_name();
+
+        $query = $wpdb->prepare(
+            "SELECT ROUND( AVG( rating ), 2 ) FROM {$log_table} log INNER JOIN {$book_table} b ON log.book_id = b.id WHERE series_id = %d AND rating IS NOT NULL",
+            $this->get_id()
+        );
+
+        return (float) $wpdb->get_var($query);
+    }
+
+}
diff --git a/src/Plugin.php b/src/Plugin.php
new file mode 100644
index 00000000..2039c4e5
--- /dev/null
+++ b/src/Plugin.php
@@ -0,0 +1,322 @@
+<?php
+/**
+ * Plugin.php
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ * @since     1.3
+ */
+
+namespace Book_Database;
+
+use Book_Database\Container\Container;
+use Book_Database\Container\Exceptions\BindingResolutionException;
+use Book_Database\Database\Authors\AuthorsTable;
+use Book_Database\Database\BookAuthor\BookAuthorTable;
+use Book_Database\Database\BookLinks\BookLinksTable;
+use Book_Database\Database\Books\BookMetaTable;
+use Book_Database\Database\Books\BooksTable;
+use Book_Database\Database\BookTaxonomies\BookTaxonomiesTable;
+use Book_Database\Database\BookTerm\BookTermRelationshipsTable;
+use Book_Database\Database\BookTerms\BookTermsTable;
+use Book_Database\Database\Editions\EditionsTable;
+use Book_Database\Database\ReadingLogs\ReadingLogsTable;
+use Book_Database\Database\Retailers\RetailersTable;
+use Book_Database\Database\Reviews\ReviewMetaTable;
+use Book_Database\Database\Reviews\ReviewsTable;
+use Book_Database\Database\Series\SeriesTable;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Helpers\HTML;
+use Book_Database\ServiceProviders\ApiServiceProvider;
+use Book_Database\ServiceProviders\AppServiceProvider;
+use Book_Database\ServiceProviders\LegacyServiceProvider;
+use Book_Database\ServiceProviders\ServiceProvider;
+use Book_Database\ServiceProviders\ShortcodeServiceProvider;
+
+final class Plugin
+{
+
+    /**
+     * @var Plugin
+     */
+    private static $instance;
+
+    /**
+     * @var Container
+     * @since 1.3
+     */
+    private $container;
+
+    /**
+     * @var string[]
+     * @since 1.3
+     */
+    private $serviceProviders = [
+        LegacyServiceProvider::class,
+        AppServiceProvider::class,
+        ApiServiceProvider::class,
+        ShortcodeServiceProvider::class,
+    ];
+
+    /**
+     * @var bool
+     * @since 1.3
+     */
+    private $serviceProvidersLoaded = false;
+
+    /**
+     * Array of custom table objects
+     *
+     * @var array
+     */
+    private $tables = array();
+
+    public function __construct()
+    {
+        $this->container = new Container();
+    }
+
+    /**
+     * Plugin instance.
+     *
+     * @return Plugin Instance of Plugin class
+     */
+    public static function instance(): Plugin
+    {
+        // Return if already instantiated
+        if (self::isInstantiated()) {
+            return self::$instance;
+        }
+
+        // Set up the singleton.
+        self::$instance = new Plugin();
+
+        // Bootstrap
+        self::$instance->setup_application();
+
+        add_action('admin_init', array(self::$instance, 'install'), 11);
+
+        return self::$instance;
+    }
+
+    /**
+     * Magic methods are passed to the service container.
+     *
+     * @since 1.3
+     *
+     * @param  string  $name
+     * @param  mixed  $arguments
+     *
+     * @return mixed
+     */
+    public function __call($name, $arguments)
+    {
+        return call_user_func_array([$this->container, $name], $arguments);
+    }
+
+    /**
+     * Properties are passed to the service container.
+     *
+     * @since 1.3
+     *
+     * @param  string  $propertyName
+     *
+     * @return mixed|object
+     * @throws BindingResolutionException
+     */
+    public function __get($propertyName)
+    {
+        return $this->container->get($propertyName);
+    }
+
+    /**
+     * Whether the main class has been instantiated or not.
+     *
+     * @return bool
+     */
+    private static function isInstantiated(): bool
+    {
+        return ! empty(self::$instance) && self::$instance instanceof Plugin;
+    }
+
+    /**
+     * Set up custom database tables
+     */
+    private function setup_application()
+    {
+        self::$instance->loadServiceProviders();
+
+        self::$instance->tables = array(
+            'authors'                   => new AuthorsTable(),
+            'book_author_relationships' => new BookAuthorTable(),
+            'book_links'                => new BookLinksTable(),
+            'book_taxonomies'           => new BookTaxonomiesTable(),
+            'book_term_relationships'   => new BookTermRelationshipsTable(),
+            'book_terms'                => new BookTermsTable(),
+            'books'                     => new BooksTable(),
+            'book_meta'                 => new BookMetaTable(),
+            'editions'                  => new EditionsTable(),
+            'reading_log'               => new ReadingLogsTable(),
+            'retailers'                 => new RetailersTable(),
+            'reviews'                   => new ReviewsTable(),
+            'review_meta'               => new ReviewMetaTable(),
+            'series'                    => new SeriesTable(),
+        );
+
+    }
+
+    private function loadServiceProviders(): void
+    {
+        if ($this->serviceProvidersLoaded) {
+            return;
+        }
+
+        $providers = [];
+
+        foreach ($this->serviceProviders as $serviceProvider) {
+            if (! is_subclass_of($serviceProvider, ServiceProvider::class)) {
+                throw new \InvalidArgumentException(sprintf(
+                    '%s class must implement the %s interface.',
+                    $serviceProvider,
+                    ServiceProvider::class
+                ));
+            }
+
+            /** @var ServiceProvider $serviceProvider */
+            $serviceProvider = new $serviceProvider;
+            $serviceProvider->register();
+            $providers[] = $serviceProvider;
+        }
+
+        foreach ($providers as $serviceProvider) {
+            $serviceProvider->boot();
+        }
+
+        $this->serviceProvidersLoaded = true;
+    }
+
+    /**
+     * Get a table object by its key
+     *
+     * @param  string  $table_key  Table key.  One of:
+     *                          'authors',
+     *                          'book_author_relationships',
+     *                          'book_links',
+     *                          'book_taxonomies',
+     *                          'book_term_relationships',
+     *                          'book_terms'
+     *                          'books'
+     *                          'book_meta',
+     *                          'editions'
+     *                          'reading_log'
+     *                          'retailers',
+     *                          'reviews',
+     *                          'review_meta',
+     *                          'series'
+     *
+     * @return BerlinDB\Database\Table|false
+     */
+    public function get_table(string $table_key)
+    {
+        return array_key_exists($table_key, self::$instance->tables) ? self::$instance->tables[$table_key] : false;
+    }
+
+    /**
+     * Returns an array of all registered tables
+     *
+     * @return BerlinDB\Database\Table[]
+     */
+    public function get_tables(): array
+    {
+        return self::$instance->tables;
+    }
+
+    /**
+     * Get the HTML helper class
+     *
+     * @return HTML
+     */
+    public function get_html(): HTML
+    {
+        return $this->html;
+    }
+
+    /**
+     * Run installation
+     *
+     *      - Install default taxonomies.
+     *      - Add rewrite tags/rules and flush
+     */
+    public function install(): void
+    {
+        if (! get_option('bdb_run_activation')) {
+            return;
+        }
+
+        /**
+         * Add default taxonomies.
+         */
+        if (! $this->get_table('book_taxonomies')->exists()) {
+            $this->get_table('book_taxonomies')->install();
+        }
+
+        $default_taxonomies = array(
+            'publisher' => array(
+                'slug'   => 'publisher',
+                'name'   => esc_html__('Publisher', 'book-database'),
+                'format' => 'text' // text, checkbox
+            ),
+            'genre'     => array(
+                'slug'   => 'genre',
+                'name'   => esc_html__('Genre', 'book-database'),
+                'format' => 'text'
+            ),
+            'source'    => array(
+                'slug'   => 'source',
+                'name'   => esc_html__('Source', 'book-database'),
+                'format' => 'checkbox'
+            )
+        );
+
+        foreach ($default_taxonomies as $taxonomy) {
+            if (get_book_taxonomy_by('slug', $taxonomy['slug'])) {
+                continue;
+            }
+
+            try {
+                add_book_taxonomy($taxonomy);
+            } catch (Exception $e) {
+
+            }
+        }
+
+        /**
+         * Add rewrite tags/rules and flush
+         */
+        add_rewrite_tags();
+        add_rewrite_rules();
+        flush_rewrite_rules(true);
+
+        /**
+         * Add capabilities
+         */
+        $role = get_role('administrator');
+
+        foreach (get_book_capabilities() as $capability) {
+            $role->add_cap($capability, true);
+        }
+
+        /**
+         * Set version number
+         */
+        update_option('bdb_version', BDB_VERSION);
+
+        if (! get_option('bdb_install_date')) {
+            update_option('bdb_install_date', date('Y-m-d H:i:s'), false);
+        }
+
+        delete_option('bdb_run_activation');
+    }
+
+}
diff --git a/includes/rest-api/abstract-class-controller.php b/src/REST_API/Controller.php
similarity index 94%
rename from includes/rest-api/abstract-class-controller.php
rename to src/REST_API/Controller.php
index 9d023859..3e95bb38 100644
--- a/includes/rest-api/abstract-class-controller.php
+++ b/src/REST_API/Controller.php
@@ -3,7 +3,7 @@
  * REST API Base Controller
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
@@ -52,4 +52,4 @@ public function can_edit( $request ) {
 		return user_can_edit_books();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/REST_API/RouteRegistration.php b/src/REST_API/RouteRegistration.php
new file mode 100644
index 00000000..7e3329ec
--- /dev/null
+++ b/src/REST_API/RouteRegistration.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * REST API Setup
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\REST_API;
+
+use Book_Database\REST_API;
+
+/**
+ * Class REST_API
+ *
+ * @package Book_Database
+ * @since 1.3 Class renamed.
+ */
+class RouteRegistration
+{
+
+    /**
+     * Register routes
+     */
+    public function register_routes(): void
+    {
+        $controllers = array(
+            '\Book_Database\REST_API\v1\Analytics',
+            '\Book_Database\REST_API\v1\Author',
+            '\Book_Database\REST_API\v1\Book',
+            '\Book_Database\REST_API\v1\Book_Link',
+            '\Book_Database\REST_API\v1\Book_Term',
+            '\Book_Database\REST_API\v1\Edition',
+            '\Book_Database\REST_API\v1\Reading_Log',
+            '\Book_Database\REST_API\v1\Retailer',
+            '\Book_Database\REST_API\v1\Review',
+            '\Book_Database\REST_API\v1\Series',
+            '\Book_Database\REST_API\v1\Taxonomy',
+            '\Book_Database\REST_API\v1\Utility',
+        );
+
+        foreach ($controllers as $controller) {
+            $controller = new $controller();
+
+            /**
+             * @var REST_API\Controller $controller
+             */
+            $controller->register_routes();
+        }
+    }
+
+}
diff --git a/includes/rest-api/v1/class-analytics-controller.php b/src/REST_API/v1/Analytics.php
similarity index 94%
rename from includes/rest-api/v1/class-analytics-controller.php
rename to src/REST_API/v1/Analytics.php
index 4135ebe5..0c910aa8 100644
--- a/includes/rest-api/v1/class-analytics-controller.php
+++ b/src/REST_API/v1/Analytics.php
@@ -3,13 +3,13 @@
  * Analytics Controller
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
 namespace Book_Database\REST_API\v1;
 
-use Book_Database\Exception;
+use Book_Database\Exceptions\Exception;
 use Book_Database\REST_API\Controller;
 use function Book_Database\Analytics\get_dataset_value;
 use function Book_Database\Analytics\get_date_filter_range;
@@ -79,7 +79,7 @@ public function register_routes() {
 				'dataset'     => array(
 					'required'          => true,
 					'validate_callback' => function ( $param, $request, $key ) {
-						return class_exists( '\\Book_Database\\Analytics\\' . $param );
+						return class_exists( '\\Book_Database\\Analytics\\Datasets\\' . $param );
 					}
 				),
 				'date_option' => array()
@@ -129,7 +129,7 @@ public function get_analytics( $request ) {
 
 			$stat_types = $request->get_param( 'stats' );
 			$stats      = array();
-			$analytics  = new \Book_Database\Analytics( $request->get_param( 'start_date' ), $request->get_param( 'end_date' ), $request->get_param( 'args' ) );
+			$analytics  = new \Book_Database\Analytics\Analytics( $request->get_param( 'start_date' ), $request->get_param( 'end_date' ), $request->get_param( 'args' ) );
 
 			foreach ( $stat_types as $stat_type ) {
 				$method = 'get_' . str_replace( '-', '_', $stat_type );
@@ -194,4 +194,4 @@ public function set_dates( $request ) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/rest-api/v1/class-author-controller.php b/src/REST_API/v1/Author.php
similarity index 94%
rename from includes/rest-api/v1/class-author-controller.php
rename to src/REST_API/v1/Author.php
index 341c2ba9..033395fb 100644
--- a/includes/rest-api/v1/class-author-controller.php
+++ b/src/REST_API/v1/Author.php
@@ -3,13 +3,13 @@
  * Author Controller
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
 namespace Book_Database\REST_API\v1;
 
-use Book_Database\Exception;
+use Book_Database\Exceptions\Exception;
 use Book_Database\REST_API\Controller;
 use function Book_Database\get_book_authors;
 
@@ -78,4 +78,4 @@ public function suggest( $request ) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/rest-api/v1/class-book-controller.php b/src/REST_API/v1/Book.php
similarity index 98%
rename from includes/rest-api/v1/class-book-controller.php
rename to src/REST_API/v1/Book.php
index 127e8296..734b3376 100644
--- a/includes/rest-api/v1/class-book-controller.php
+++ b/src/REST_API/v1/Book.php
@@ -3,14 +3,14 @@
  * Book Controller
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
 namespace Book_Database\REST_API\v1;
 
-use Book_Database\Books_Query;
-use Book_Database\Exception;
+use Book_Database\Database\Books\BooksQuery;
+use Book_Database\Exceptions\Exception;
 use Book_Database\REST_API\Controller;
 use function Book_Database\add_book;
 use function Book_Database\book_grid_shortcode;
@@ -254,7 +254,7 @@ public function get_books( $request ) {
 				'order'   => 'ASC'
 			) );
 
-			$query = new Books_Query();
+			$query = new BooksQuery();
 			$books = $query->get_books( $args );
 
 			foreach ( $books as $key => $book ) {
diff --git a/includes/rest-api/v1/class-book-link-controller.php b/src/REST_API/v1/Book_Link.php
similarity index 98%
rename from includes/rest-api/v1/class-book-link-controller.php
rename to src/REST_API/v1/Book_Link.php
index 702e61ad..7647c7dc 100644
--- a/includes/rest-api/v1/class-book-link-controller.php
+++ b/src/REST_API/v1/Book_Link.php
@@ -3,13 +3,13 @@
  * Book Link Controller
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
 namespace Book_Database\REST_API\v1;
 
-use Book_Database\Exception;
+use Book_Database\Exceptions\Exception;
 use Book_Database\REST_API\Controller;
 use function Book_Database\add_book_link;
 use function Book_Database\delete_book_link;
@@ -289,4 +289,4 @@ public function delete_item( $request ) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/rest-api/v1/class-book-term-controller.php b/src/REST_API/v1/Book_Term.php
similarity index 95%
rename from includes/rest-api/v1/class-book-term-controller.php
rename to src/REST_API/v1/Book_Term.php
index 6148d5c0..740e408b 100644
--- a/includes/rest-api/v1/class-book-term-controller.php
+++ b/src/REST_API/v1/Book_Term.php
@@ -3,13 +3,13 @@
  * Book Term Controller
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
 namespace Book_Database\REST_API\v1;
 
-use Book_Database\Exception;
+use Book_Database\Exceptions\Exception;
 use Book_Database\REST_API\Controller;
 use function Book_Database\get_book_terms;
 
@@ -87,4 +87,4 @@ public function suggest( $request ) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/rest-api/v1/class-edition-controller.php b/src/REST_API/v1/Edition.php
similarity index 98%
rename from includes/rest-api/v1/class-edition-controller.php
rename to src/REST_API/v1/Edition.php
index 2355d449..afc21dc3 100644
--- a/includes/rest-api/v1/class-edition-controller.php
+++ b/src/REST_API/v1/Edition.php
@@ -3,13 +3,13 @@
  * Book Edition Controller
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
 namespace Book_Database\REST_API\v1;
 
-use Book_Database\Exception;
+use Book_Database\Exceptions\Exception;
 use Book_Database\REST_API\Controller;
 use function Book_Database\add_book_term;
 use function Book_Database\add_edition;
@@ -140,7 +140,7 @@ public function register_routes() {
 						}
 
 						if ( is_numeric( $param ) ) {
-							return get_book_term( $param ) instanceof \Book_Database\Book_Term;
+							return get_book_term( $param ) instanceof \Book_Database\Models\BookTerm;
 						}
 
 						return true;
@@ -168,7 +168,7 @@ public function register_routes() {
 								$source = get_book_term( $source_id );
 							}
 
-							if ( ! isset( $source ) || ! $source instanceof \Book_Database\Book_Term ) {
+							if ( ! isset( $source ) || ! $source instanceof \Book_Database\Models\BookTerm ) {
 								throw new \Exception();
 							}
 
@@ -239,7 +239,7 @@ public function register_routes() {
 						}
 
 						if ( is_numeric( $param ) ) {
-							return get_book_term( $param ) instanceof \Book_Database\Book_Term;
+							return get_book_term( $param ) instanceof \Book_Database\Models\BookTerm;
 						}
 
 						return true;
@@ -267,7 +267,7 @@ public function register_routes() {
 								$source = get_book_term( $source_id );
 							}
 
-							if ( ! isset( $source ) || ! $source instanceof \Book_Database\Book_Term ) {
+							if ( ! isset( $source ) || ! $source instanceof \Book_Database\Models\BookTerm ) {
 								throw new \Exception();
 							}
 
@@ -434,4 +434,4 @@ public function delete_edition( $request ) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/rest-api/v1/class-reading-log-controller.php b/src/REST_API/v1/Reading_Log.php
similarity index 98%
rename from includes/rest-api/v1/class-reading-log-controller.php
rename to src/REST_API/v1/Reading_Log.php
index 351b3d87..47756704 100644
--- a/includes/rest-api/v1/class-reading-log-controller.php
+++ b/src/REST_API/v1/Reading_Log.php
@@ -3,13 +3,13 @@
  * Reading Log Controller
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
 namespace Book_Database\REST_API\v1;
 
-use Book_Database\Exception;
+use Book_Database\Exceptions\Exception;
 use Book_Database\REST_API\Controller;
 use function Book_Database\add_reading_log;
 use function Book_Database\delete_reading_log;
@@ -114,7 +114,7 @@ public function register_routes() {
 							return false;
 						}
 
-						return get_edition( absint( $param ) ) instanceof \Book_Database\Edition;
+						return get_edition( absint( $param ) ) instanceof \Book_Database\Models\Edition;
 					},
 					'sanitize_callback' => function ( $param, $request, $key ) {
 						return ! empty( absint( $param ) ) ? absint( $param ) : null;
@@ -207,7 +207,7 @@ public function register_routes() {
 							return false;
 						}
 
-						return get_edition( absint( $param ) ) instanceof \Book_Database\Edition;
+						return get_edition( absint( $param ) ) instanceof \Book_Database\Models\Edition;
 					},
 					'sanitize_callback' => function ( $param, $request, $key ) {
 						return ! empty( absint( $param ) ) ? absint( $param ) : null;
@@ -413,4 +413,4 @@ public function delete_reading_log( $request ) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/rest-api/v1/class-retailer-controller.php b/src/REST_API/v1/Retailer.php
similarity index 98%
rename from includes/rest-api/v1/class-retailer-controller.php
rename to src/REST_API/v1/Retailer.php
index aa587027..a4187ec4 100644
--- a/includes/rest-api/v1/class-retailer-controller.php
+++ b/src/REST_API/v1/Retailer.php
@@ -3,13 +3,13 @@
  * Retailer Controller
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
 namespace Book_Database\REST_API\v1;
 
-use Book_Database\Exception;
+use Book_Database\Exceptions\Exception;
 use Book_Database\REST_API\Controller;
 use function Book_Database\add_retailer;
 use function Book_Database\delete_retailer;
@@ -256,4 +256,4 @@ public function delete_retailer( $request ) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/rest-api/v1/class-review-controller.php b/src/REST_API/v1/Review.php
similarity index 97%
rename from includes/rest-api/v1/class-review-controller.php
rename to src/REST_API/v1/Review.php
index 92187589..d83fbf9b 100644
--- a/includes/rest-api/v1/class-review-controller.php
+++ b/src/REST_API/v1/Review.php
@@ -3,14 +3,14 @@
  * Review Controller
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
 namespace Book_Database\REST_API\v1;
 
-use Book_Database\Exception;
-use Book_Database\Rating;
+use Book_Database\Exceptions\Exception;
+use Book_Database\ValueObjects\Rating;
 use Book_Database\REST_API\Controller;
 use function Book_Database\add_review;
 use function Book_Database\delete_review;
@@ -178,7 +178,7 @@ public function get_reviews( $request ) {
 			// Format ratings.
 			if ( $request->get_param( 'rating_format' ) ) {
 				foreach ( $reviews as $key => $review ) {
-					if ( is_null( $review->rating ) ) {
+					if ( is_null( $review->rating ?? null ) ) {
 						continue;
 					}
 
@@ -265,4 +265,4 @@ public function delete_review( $request ) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/rest-api/v1/class-series-controller.php b/src/REST_API/v1/Series.php
similarity index 97%
rename from includes/rest-api/v1/class-series-controller.php
rename to src/REST_API/v1/Series.php
index c48f4651..13c76c84 100644
--- a/includes/rest-api/v1/class-series-controller.php
+++ b/src/REST_API/v1/Series.php
@@ -3,13 +3,13 @@
  * Series Controller
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
 namespace Book_Database\REST_API\v1;
 
-use Book_Database\Exception;
+use Book_Database\Exceptions\Exception;
 use Book_Database\REST_API\Controller;
 use function Book_Database\add_book_series;
 use function Book_Database\delete_book_series;
@@ -81,7 +81,7 @@ public function register_routes() {
 					'validate_callback' => function ( $param, $request, $key ) {
 						$series = get_book_series_by( 'id', $param );
 
-						return $series instanceof \Book_Database\Series;
+						return $series instanceof \Book_Database\Models\Series;
 					},
 					'sanitize_callback' => function ( $param, $request, $key ) {
 						return absint( $param );
@@ -124,7 +124,7 @@ public function register_routes() {
 					'validate_callback' => function ( $param, $request, $key ) {
 						$series = get_book_series_by( 'id', $param );
 
-						return $series instanceof \Book_Database\Series;
+						return $series instanceof \Book_Database\Models\Series;
 					},
 					'sanitize_callback' => function ( $param, $request, $key ) {
 						return absint( $param );
@@ -309,4 +309,4 @@ public function suggest( $request ) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/rest-api/v1/class-taxonomy-controller.php b/src/REST_API/v1/Taxonomy.php
similarity index 98%
rename from includes/rest-api/v1/class-taxonomy-controller.php
rename to src/REST_API/v1/Taxonomy.php
index 53c2fcc2..3fec526d 100644
--- a/includes/rest-api/v1/class-taxonomy-controller.php
+++ b/src/REST_API/v1/Taxonomy.php
@@ -3,14 +3,14 @@
  * Taxonomy Controller
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
 namespace Book_Database\REST_API\v1;
 
 use \Book_Database\REST_API\Controller;
-use \Book_Database\Exception;
+use Book_Database\Exceptions\Exception;
 use function Book_Database\add_book_taxonomy;
 use function Book_Database\delete_book_taxonomy;
 use function Book_Database\get_book_taxonomies;
@@ -183,4 +183,4 @@ public function delete_taxonomy( $request ) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/includes/rest-api/v1/class-utility-controller.php b/src/REST_API/v1/Utility.php
similarity index 93%
rename from includes/rest-api/v1/class-utility-controller.php
rename to src/REST_API/v1/Utility.php
index 830e1e7c..b010416b 100644
--- a/includes/rest-api/v1/class-utility-controller.php
+++ b/src/REST_API/v1/Utility.php
@@ -3,13 +3,13 @@
  * Utility Controller
  *
  * @package   book-database
- * @copyright Copyright (c) 2019, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  */
 
 namespace Book_Database\REST_API\v1;
 
-use Book_Database\Exception;
+use Book_Database\Exceptions\Exception;
 use Book_Database\REST_API\Controller;
 
 /**
@@ -66,4 +66,4 @@ public function convert_date( $request ) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/ServiceProviders/ApiServiceProvider.php b/src/ServiceProviders/ApiServiceProvider.php
new file mode 100644
index 00000000..33984b1c
--- /dev/null
+++ b/src/ServiceProviders/ApiServiceProvider.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * ApiServiceProvider.php
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\ServiceProviders;
+
+use Book_Database\Helpers\Hooks;
+use Book_Database\REST_API\RouteRegistration;
+
+class ApiServiceProvider implements ServiceProvider
+{
+
+    public function register(): void
+    {
+
+    }
+
+    public function boot(): void
+    {
+        Hooks::addAction('rest_api_init', RouteRegistration::class, 'register_routes');
+    }
+}
diff --git a/src/ServiceProviders/AppServiceProvider.php b/src/ServiceProviders/AppServiceProvider.php
new file mode 100644
index 00000000..1b94dd99
--- /dev/null
+++ b/src/ServiceProviders/AppServiceProvider.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * AppServiceProvider.php
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2022, Ashley Gibson
+ * @license   GPL2+
+ * @since     1.3
+ */
+
+namespace Book_Database\ServiceProviders;
+
+class AppServiceProvider implements ServiceProvider
+{
+
+    public function register(): void
+    {
+
+    }
+
+    public function boot(): void
+    {
+        add_action('contextwp_sdk_loaded', function (\ContextWP\SDK $sdk) {
+            $sdk->register(
+                (new \ContextWP\ValueObjects\Product('af272e18-bea7-42fd-b531-f898fbd55b25', '75f43cf9-febb-44f2-8b02-e73a36590d6c'))
+                    ->setVersion(BDB_VERSION)
+            );
+        });
+    }
+}
diff --git a/src/ServiceProviders/LegacyServiceProvider.php b/src/ServiceProviders/LegacyServiceProvider.php
new file mode 100644
index 00000000..c2d9ef57
--- /dev/null
+++ b/src/ServiceProviders/LegacyServiceProvider.php
@@ -0,0 +1,376 @@
+<?php
+/**
+ * LegacyServiceProvider.php
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\ServiceProviders;
+
+use Book_Database\Analytics\Analytics;
+use Book_Database\Database\Authors\AuthorsQuery;
+use Book_Database\Database\Authors\AuthorsSchema;
+use Book_Database\Database\Authors\AuthorsTable;
+use Book_Database\Database\BookAuthor\BookAuthorQuery;
+use Book_Database\Database\BookAuthor\BookAuthorSchema;
+use Book_Database\Database\BookAuthor\BookAuthorTable;
+use Book_Database\Database\BookLinks\BookLinksQuery;
+use Book_Database\Database\BookLinks\BookLinksSchema;
+use Book_Database\Database\BookLinks\BookLinksTable;
+use Book_Database\Database\Books\BookMetaTable;
+use Book_Database\Database\Books\BooksQuery;
+use Book_Database\Database\Books\BooksSchema;
+use Book_Database\Database\Books\BooksTable;
+use Book_Database\Database\BookTaxonomies\BookTaxonomiesQuery;
+use Book_Database\Database\BookTaxonomies\BookTaxonomiesSchema;
+use Book_Database\Database\BookTaxonomies\BookTaxonomiesTable;
+use Book_Database\Database\BookTerm\BookTermRelationshipQuery;
+use Book_Database\Database\BookTerm\BookTermRelationshipsSchema;
+use Book_Database\Database\BookTerm\BookTermRelationshipsTable;
+use Book_Database\Database\BookTerms\BookTermsQuery;
+use Book_Database\Database\BookTerms\BookTermsSchema;
+use Book_Database\Database\BookTerms\BookTermsTable;
+use Book_Database\Database\Editions\EditionsQuery;
+use Book_Database\Database\Editions\EditionsSchema;
+use Book_Database\Database\Editions\EditionsTable;
+use Book_Database\Database\ReadingLogs\ReadingLogsQuery;
+use Book_Database\Database\ReadingLogs\ReadingLogsSchema;
+use Book_Database\Database\ReadingLogs\ReadingLogsTable;
+use Book_Database\Database\Retailers\RetailersQuery;
+use Book_Database\Database\Retailers\RetailersSchema;
+use Book_Database\Database\Retailers\RetailersTable;
+use Book_Database\Database\Reviews\ReviewMetaTable;
+use Book_Database\Database\Reviews\ReviewsQuery;
+use Book_Database\Database\Reviews\ReviewsSchema;
+use Book_Database\Database\Reviews\ReviewsTable;
+use Book_Database\Database\Series\SeriesQuery;
+use Book_Database\Database\Series\SeriesSchema;
+use Book_Database\Database\Series\SeriesTable;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Helpers\HTML;
+use Book_Database\Models\Author;
+use Book_Database\Models\Book;
+use Book_Database\Models\BookAuthorRelationship;
+use Book_Database\Models\BookLink;
+use Book_Database\Models\BookTaxonomy;
+use Book_Database\Models\BookTerm;
+use Book_Database\Models\BookTermRelationship;
+use Book_Database\Models\Edition;
+use Book_Database\Models\Model;
+use Book_Database\Models\ReadingLog;
+use Book_Database\Models\Retailer;
+use Book_Database\Models\Review;
+use Book_Database\Models\Series;
+use Book_Database\Plugin;
+use Book_Database\REST_API\RouteRegistration;
+use Book_Database\ValueObjects\Rating;
+use function Book_Database\book_database;
+
+class LegacyServiceProvider implements ServiceProvider
+{
+
+    public function register(): void
+    {
+        $this->includeLegacyFiles();
+
+        if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
+            $this->includeAdminFiles();
+        } else {
+            $this->includeFrontendFiles();
+        }
+
+        $this->registerClassAliases();
+        $this->bindClasses();
+    }
+
+    public function boot(): void
+    {
+
+    }
+
+    private function includeLegacyFiles(): void
+    {
+        require_once BDB_DIR.'includes/deprecated/deprecated-functions.php';
+
+        // Database engine
+        require_once BDB_DIR.'includes/database/engine/base.php';
+        require_once BDB_DIR.'includes/database/engine/table.php';
+        require_once BDB_DIR.'includes/database/engine/query.php';
+        require_once BDB_DIR.'includes/database/engine/column.php';
+        require_once BDB_DIR.'includes/database/engine/row.php';
+        require_once BDB_DIR.'includes/database/engine/schema.php';
+        require_once BDB_DIR.'includes/database/engine/compare.php';
+        require_once BDB_DIR.'includes/database/engine/date.php';
+        require_once BDB_DIR.'includes/database/engine/series.php';
+        require_once BDB_DIR.'includes/database/engine/tax.php';
+        require_once BDB_DIR.'includes/database/engine/author.php';
+        require_once BDB_DIR.'includes/database/engine/join.php';
+        require_once BDB_DIR.'includes/database/engine/book.php';
+        require_once BDB_DIR.'includes/database/engine/edition.php';
+        require_once BDB_DIR.'includes/database/engine/reading-log.php';
+        require_once BDB_DIR.'includes/database/engine/class-where-clause.php';
+        require_once BDB_DIR.'includes/database/sanitization.php';
+
+        // Analytics
+        require_once BDB_DIR.'includes/analytics/analytics-functions.php';
+
+        // Authors
+        require_once BDB_DIR.'includes/authors/author-functions.php';
+
+        // Blocks
+        require_once BDB_DIR.'includes/blocks.php';
+
+        // Book Author Relationships
+        require_once BDB_DIR.'includes/book-author-relationships/book-author-relationship-actions.php';
+        require_once BDB_DIR.'includes/book-author-relationships/book-author-relationship-functions.php';
+
+        // Books
+        require_once BDB_DIR.'includes/books/book-functions.php';
+        require_once BDB_DIR.'includes/books/book-layout-functions.php';
+        require_once BDB_DIR.'includes/books/book-meta.php';
+
+        // Book Links
+        require_once BDB_DIR.'includes/book-links/book-link-functions.php';
+
+        // Book Taxonomies
+        require_once BDB_DIR.'includes/book-taxonomies/book-taxonomy-functions.php';
+
+        // Book Term Relationships
+        require_once BDB_DIR.'includes/book-term-relationships/book-term-relationship-actions.php';
+        require_once BDB_DIR.'includes/book-term-relationships/book-term-relationship-functions.php';
+
+        // Book Terms
+        require_once BDB_DIR.'includes/book-terms/book-term-functions.php';
+
+        // Editions
+        require_once BDB_DIR.'includes/editions/edition-functions.php';
+
+        // Ratings
+        require_once BDB_DIR.'includes/ratings/rating-functions.php';
+
+        // Reading Logs
+        require_once BDB_DIR.'includes/reading-logs/reading-log-functions.php';
+
+        // Retailers
+        require_once BDB_DIR.'includes/retailers/retailer-functions.php';
+
+        // Reviews
+        require_once BDB_DIR.'includes/reviews/review-actions.php';
+        require_once BDB_DIR.'includes/reviews/review-functions.php';
+        require_once BDB_DIR.'includes/reviews/review-meta.php';
+
+        // Series
+        require_once BDB_DIR.'includes/series/series-functions.php';
+
+        // Misc.
+        require_once BDB_DIR.'includes/capabilities.php';
+        require_once BDB_DIR.'includes/misc-functions.php';
+        require_once BDB_DIR.'includes/rewrites.php';
+        require_once BDB_DIR.'includes/template-functions.php';
+    }
+
+    private function includeAdminFiles(): void
+    {
+        require_once BDB_DIR.'includes/admin/admin-assets.php';
+        require_once BDB_DIR.'includes/admin/admin-bar.php';
+        require_once BDB_DIR.'includes/admin/admin-notices.php';
+        require_once BDB_DIR.'includes/admin/admin-pages.php';
+
+        // Analytics
+        require_once BDB_DIR.'includes/admin/analytics/analytics-page.php';
+        require_once BDB_DIR.'includes/admin/analytics/tabs/overview.php';
+        require_once BDB_DIR.'includes/admin/analytics/tabs/library.php';
+        require_once BDB_DIR.'includes/admin/analytics/tabs/reading.php';
+        require_once BDB_DIR.'includes/admin/analytics/tabs/ratings.php';
+        require_once BDB_DIR.'includes/admin/analytics/tabs/editions.php';
+        require_once BDB_DIR.'includes/admin/analytics/tabs/reviews.php';
+        require_once BDB_DIR.'includes/admin/analytics/tabs/terms.php';
+
+        // Authors
+        require_once BDB_DIR.'includes/admin/authors/author-actions.php';
+        require_once BDB_DIR.'includes/admin/authors/author-functions.php';
+        require_once BDB_DIR.'includes/admin/authors/authors-page.php';
+
+        // Book Terms
+        require_once BDB_DIR.'includes/admin/book-terms/book-term-actions.php';
+        require_once BDB_DIR.'includes/admin/book-terms/book-term-functions.php';
+        require_once BDB_DIR.'includes/admin/book-terms/book-terms-page.php';
+
+        // Books
+        require_once BDB_DIR.'includes/admin/books/book-actions.php';
+        require_once BDB_DIR.'includes/admin/books/book-functions.php';
+        require_once BDB_DIR.'includes/admin/books/books-page.php';
+        require_once BDB_DIR.'includes/admin/books/edit-book-fields.php';
+
+        // Dashboard
+        require_once BDB_DIR.'includes/admin/dashboard/widgets.php';
+
+        // Editions
+        require_once BDB_DIR.'includes/admin/editions/edition-actions.php';
+
+        // Licensing
+        require_once BDB_DIR.'includes/class-edd-sl-plugin-updater.php';
+        require_once BDB_DIR.'includes/admin/licensing/class-license-key.php';
+        require_once BDB_DIR.'includes/admin/licensing/license-actions.php';
+
+        // Posts
+        require_once BDB_DIR.'includes/admin/posts/post-actions.php';
+
+        // Reading Logs
+        require_once BDB_DIR.'includes/admin/reading-logs/reading-log-actions.php';
+
+        // Reviews
+        require_once BDB_DIR.'includes/admin/reviews/review-actions.php';
+        require_once BDB_DIR.'includes/admin/reviews/review-fields.php';
+        require_once BDB_DIR.'includes/admin/reviews/review-functions.php';
+        require_once BDB_DIR.'includes/admin/reviews/reviews-page.php';
+
+        // Series
+        require_once BDB_DIR.'includes/admin/series/series-actions.php';
+        require_once BDB_DIR.'includes/admin/series/series-functions.php';
+        require_once BDB_DIR.'includes/admin/series/series-page.php';
+
+        // Settings
+        require_once BDB_DIR.'includes/admin/settings/book-layout-functions.php';
+        require_once BDB_DIR.'includes/admin/settings/register-settings.php';
+        require_once BDB_DIR.'includes/admin/settings/display-settings.php';
+    }
+
+    private function includeFrontendFiles(): void
+    {
+        require_once BDB_DIR.'includes/assets.php';
+    }
+
+    /**
+     * These classes have been renamed.
+     */
+    private function registerClassAliases(): void
+    {
+        class_alias(Plugin::class, 'Book_Database\\Book_Database');
+
+        // Databases
+        class_alias(AuthorsTable::class, 'Book_Database\\Authors_Table');
+        class_alias(AuthorsQuery::class, 'Book_Database\\Authors_Query');
+        class_alias(AuthorsSchema::class, 'Book_Database\\Authors_Schema');
+
+        class_alias(BookAuthorQuery::class, 'Book_Database\\Book_Author_Relationships_Query');
+        class_alias(BookAuthorSchema::class, 'Book_Database\\Book_Author_Relationships_Schema');
+        class_alias(BookAuthorTable::class, 'Book_Database\\Book_Author_Relationships_Table');
+
+        class_alias(BookLinksQuery::class, 'Book_Database\\Book_Links_Query');
+        class_alias(BookLinksSchema::class, 'Book_Database\\Book_Links_Schema');
+        class_alias(BookLinksTable::class, 'Book_Database\\Book_Links_Table');
+
+        class_alias(BookTaxonomiesQuery::class, 'Book_Database\\Book_Taxonomies_Query');
+        class_alias(BookTaxonomiesSchema::class, 'Book_Database\\Book_Taxonomies_Schema');
+        class_alias(BookTaxonomiesTable::class, 'Book_Database\\Book_Taxonomies_Table');
+
+        class_alias(BookTermRelationshipQuery::class, 'Book_Database\\Book_Term_Relationships_Query');
+        class_alias(BookTermRelationshipsSchema::class, 'Book_Database\\Book_Term_Relationships_Schema');
+        class_alias(BookTermRelationshipsTable::class, 'Book_Database\\Book_Term_Relationships_Table');
+
+        class_alias(BookTermsQuery::class, 'Book_Database\\Book_Terms_Query');
+        class_alias(BookTermsSchema::class, 'Book_Database\\Book_Terms_Schema');
+        class_alias(BookTermsTable::class, 'Book_Database\\Book_Terms_Table');
+
+        class_alias(BookMetaTable::class, 'Book_Database\\Book_Meta_Table');
+        class_alias(BooksQuery::class, 'Book_Database\\Books_Query');
+        class_alias(BooksSchema::class, 'Book_Database\\Books_Schema');
+        class_alias(BooksTable::class, 'Book_Database\\Books_Table');
+
+        class_alias(EditionsQuery::class, 'Book_Database\Editions_Query');
+        class_alias(EditionsSchema::class, 'Book_Database\\Editions_Schema');
+        class_alias(EditionsTable::class, 'Book_Database\\Editions_Table');
+
+        class_alias(ReadingLogsQuery::class, 'Book_Database\\Reading_Logs_Query');
+        class_alias(ReadingLogsSchema::class, 'Book_Database\\Reading_Logs_Schema');
+        class_alias(ReadingLogsTable::class, 'Book_Database\\Reading_Logs_Table');
+
+        class_alias(RetailersQuery::class, 'Book_Database\\Retailers_Query');
+        class_alias(RetailersSchema::class, 'Book_Database\\Retailers_Schema');
+        class_alias(RetailersTable::class, 'Book_Database\\Retailers_Table');
+
+        class_alias(ReviewMetaTable::class, 'Book_Database\\Review_Meta_Table');
+        class_alias(ReviewsQuery::class, 'Book_Database\\Reviews_Query');
+        class_alias(ReviewsSchema::class, 'Book_Database\\Reviews_Schema');
+        class_alias(ReviewsTable::class, 'Book_Database\\Reviews_Table');
+
+        class_alias(SeriesQuery::class, 'Book_Database\\Series_Query');
+        class_alias(SeriesSchema::class, 'Book_Database\\Series_Schema');
+        class_alias(SeriesTable::class, 'Book_Database\\Series_Table');
+
+        // Models
+        class_alias(Model::class, 'Book_Database\\Base_Object');
+        class_alias(Author::class, 'Book_Database\\Author');
+        class_alias(Book::class, 'Book_Database\\Book');
+        class_alias(BookAuthorRelationship::class, 'Book_Database\\Book_Author_Relationship');
+        class_alias(BookLink::class, 'Book_Database\\Book_Link');
+        class_alias(BookTaxonomy::class, 'Book_Database\\Book_Taxonomy');
+        class_alias(BookTerm::class, 'Book_Database\\Book_Term');
+        class_alias(BookTermRelationship::class, 'Book_Database\\Book_Term_Relationship');
+        class_alias(ReadingLog::class, 'Book_Database\\Reading_Log');
+        class_alias(Edition::class, 'Book_Database\\Edition');
+        class_alias(Retailer::class, 'Book_Database\\Retailer');
+        class_alias(Review::class, 'Book_Database\\Review');
+        class_alias(Series::class, 'Book_Database\\Series');
+
+        // Misc.
+        class_alias(Rating::class, 'Book_Database\\Rating');
+        class_alias(Exception::class, 'Book_Database\\Exception');
+        class_alias(HTML::class, 'Book_Database\\HTML');
+        class_alias(RouteRegistration::class, 'Book_Database\\REST_API');
+
+        // Analytics
+        class_alias(Analytics::class, 'Book_Database\\Analytics');
+        class_alias( \Book_Database\Analytics\Datasets\Average_Days_Acquired_to_Read::class, '\Book_Database\Analytics\Average_Days_Acquired_to_Read' );
+        class_alias( \Book_Database\Analytics\Datasets\Average_Days_Finish_Book::class, '\Book_Database\Analytics\Average_Days_Finish_Book' );
+        class_alias( \Book_Database\Analytics\Datasets\Average_Rating::class, '\Book_Database\Analytics\Average_Rating' );
+        class_alias( \Book_Database\Analytics\Datasets\Books_Per_Year::class, '\Book_Database\Analytics\Books_Per_Year' );
+        class_alias( \Book_Database\Analytics\Datasets\Books_Read_by_Publication_Year::class, '\Book_Database\Analytics\Books_Read_by_Publication_Year' );
+        class_alias( \Book_Database\Analytics\Datasets\Books_Read_Over_Time::class, '\Book_Database\Analytics\Books_Read_Over_Time' );
+        class_alias( \Book_Database\Analytics\Datasets\Edition_Format_Breakdown::class, '\Book_Database\Analytics\Edition_Format_Breakdown' );
+        class_alias( \Book_Database\Analytics\Datasets\Edition_Genre_Breakdown::class, '\Book_Database\Analytics\Edition_Genre_Breakdown' );
+        class_alias( \Book_Database\Analytics\Datasets\Edition_Source_Breakdown::class, '\Book_Database\Analytics\Edition_Source_Breakdown' );
+        class_alias( \Book_Database\Analytics\Datasets\Editions_Over_Time::class, '\Book_Database\Analytics\Editions_Over_Time' );
+        class_alias( \Book_Database\Analytics\Datasets\Format_Breakdown::class, '\Book_Database\Analytics\Format_Breakdown' );
+        class_alias( \Book_Database\Analytics\Datasets\Highest_Rated_Books::class, '\Book_Database\Analytics\Highest_Rated_Books' );
+        class_alias( \Book_Database\Analytics\Datasets\Library_Book_Releases::class, '\Book_Database\Analytics\Library_Book_Releases' );
+        class_alias( \Book_Database\Analytics\Datasets\Library_Genre_Breakdown::class, '\Book_Database\Analytics\Library_Genre_Breakdown' );
+        class_alias( \Book_Database\Analytics\Datasets\Longest_Book_Read::class, '\Book_Database\Analytics\Longest_Book_Read' );
+        class_alias( \Book_Database\Analytics\Datasets\Lowest_Rated_Books::class, '\Book_Database\Analytics\Lowest_Rated_Books' );
+        class_alias( \Book_Database\Analytics\Datasets\Most_Read_Genres::class, '\Book_Database\Analytics\Most_Read_Genres' );
+        class_alias( \Book_Database\Analytics\Datasets\Number_Books_Added::class, '\Book_Database\Analytics\Number_Books_Added' );
+        class_alias( \Book_Database\Analytics\Datasets\Number_Different_Authors_Read::class, '\Book_Database\Analytics\Number_Different_Authors_Read' );
+        class_alias( \Book_Database\Analytics\Datasets\Number_Different_Series_Read::class, '\Book_Database\Analytics\Number_Different_Series_Read' );
+        class_alias( \Book_Database\Analytics\Datasets\Number_Distinct_Authors_Added::class, '\Book_Database\Analytics\Number_Distinct_Authors_Added' );
+        class_alias( \Book_Database\Analytics\Datasets\Number_Editions::class, '\Book_Database\Analytics\Number_Editions' );
+        class_alias( \Book_Database\Analytics\Datasets\Number_Reviews_Written::class, '\Book_Database\Analytics\Number_Reviews_Written' );
+        class_alias( \Book_Database\Analytics\Datasets\Number_Series_Books_Added::class, '\Book_Database\Analytics\Number_Series_Books_Added' );
+        class_alias( \Book_Database\Analytics\Datasets\Number_Signed_Editions::class, '\Book_Database\Analytics\Number_Signed_Editions' );
+        class_alias( \Book_Database\Analytics\Datasets\Number_Standalones_Added::class, '\Book_Database\Analytics\Number_Standalones_Added' );
+        class_alias( \Book_Database\Analytics\Datasets\Number_Standalones_Read::class, '\Book_Database\Analytics\Number_Standalones_Read' );
+        class_alias( \Book_Database\Analytics\Datasets\Pages_Breakdown::class, '\Book_Database\Analytics\Pages_Breakdown' );
+        class_alias( \Book_Database\Analytics\Datasets\Pages_Read::class, '\Book_Database\Analytics\Pages_Read' );
+        class_alias( \Book_Database\Analytics\Datasets\Ratings_Breakdown::class, '\Book_Database\Analytics\Ratings_Breakdown' );
+        class_alias( \Book_Database\Analytics\Datasets\Reading_Overview::class, '\Book_Database\Analytics\Reading_Overview' );
+        class_alias( \Book_Database\Analytics\Datasets\Reading_Track::class, '\Book_Database\Analytics\Reading_Track' );
+        class_alias( \Book_Database\Analytics\Datasets\Reviews_Over_Time::class, '\Book_Database\Analytics\Reviews_Over_Time' );
+        class_alias( \Book_Database\Analytics\Datasets\Reviews_Written::class, '\Book_Database\Analytics\Reviews_Written' );
+        class_alias( \Book_Database\Analytics\Datasets\Shortest_Book_Read::class, '\Book_Database\Analytics\Shortest_Book_Read' );
+        class_alias( \Book_Database\Analytics\Datasets\Terms_Breakdown::class, '\Book_Database\Analytics\Terms_Breakdown' );
+
+        // Admin
+        class_alias(\Book_Database\Admin\Utils\ListTable::class, '\Book_Database\List_Table');
+    }
+
+    private function bindClasses(): void
+    {
+        book_database()->bind(RouteRegistration::class);
+        book_database()->alias(RouteRegistration::class, 'rest_api');
+
+        book_database()->bind(HTML::class);
+        book_database()->alias(HTML::class, 'html');
+    }
+}
diff --git a/src/ServiceProviders/ServiceProvider.php b/src/ServiceProviders/ServiceProvider.php
new file mode 100644
index 00000000..04b8d409
--- /dev/null
+++ b/src/ServiceProviders/ServiceProvider.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * ServiceProvider.php
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ * @since     1.3
+ */
+
+namespace Book_Database\ServiceProviders;
+
+interface ServiceProvider
+{
+
+    /**
+     * Registers the service provider within the application.
+     *
+     * @since 1.3
+     *
+     * @return void
+     */
+    public function register(): void;
+
+    /**
+     * Bootstraps the service after all of the services have been registered.
+     * All dependencies will be available at this point.
+     *
+     * @since 1.3
+     *
+     * @return void
+     */
+    public function boot(): void;
+
+}
diff --git a/src/ServiceProviders/ShortcodeServiceProvider.php b/src/ServiceProviders/ShortcodeServiceProvider.php
new file mode 100644
index 00000000..bc3e9d54
--- /dev/null
+++ b/src/ServiceProviders/ShortcodeServiceProvider.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * ShortcodeServiceProvider.php
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ * @since     1.3
+ */
+
+namespace Book_Database\ServiceProviders;
+
+use Book_Database\Shortcodes\BookGridShortcode;
+use Book_Database\Shortcodes\BookReviewsShortcode;
+use Book_Database\Shortcodes\BookShortcode;
+use Book_Database\Shortcodes\Shortcode;
+use function Book_Database\book_database;
+
+class ShortcodeServiceProvider implements ServiceProvider
+{
+    protected $shortcodes = [
+        BookGridShortcode::class,
+        BookReviewsShortcode::class,
+        BookShortcode::class,
+    ];
+
+    public function register(): void
+    {
+
+    }
+
+    public function boot(): void
+    {
+        foreach ($this->shortcodes as $shortcode) {
+            if (is_subclass_of($shortcode, Shortcode::class)) {
+                /** @var Shortcode $shortcode */
+                $shortcode = book_database()->make($shortcode);
+                add_shortcode($shortcode::tag(), [$shortcode, 'make']);
+            }
+        }
+    }
+}
diff --git a/src/Shortcodes/BookGridShortcode.php b/src/Shortcodes/BookGridShortcode.php
new file mode 100644
index 00000000..7ec01857
--- /dev/null
+++ b/src/Shortcodes/BookGridShortcode.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * BookGrid.php
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ * @since     1.3
+ */
+
+namespace Book_Database\Shortcodes;
+
+use Book_Database\Book_Grid_Query;
+use Book_Database\Models\Book;
+use Book_Database\Models\Review;
+use function Book_Database\get_book_taxonomies;
+use function Book_Database\get_book_template_part;
+
+class BookGridShortcode implements Shortcode
+{
+
+    public static function tag(): string
+    {
+        return 'book-grid';
+    }
+
+    public function make($atts, $content = ''): string
+    {
+        $default_atts = array(
+            'ids'                 => '',
+            'author'              => '',
+            'series'              => '',
+            'rating'              => '',
+            'pub-date-after'      => '',
+            'pub-date-before'     => '',
+            'pub-year'            => '',
+            'read-status'         => '',
+            'review-date-after'   => '',
+            'review-date-before'  => '',
+            'review-start-date'   => '', // Deprecated
+            'review-end-date'     => '', // Deprecated
+            'reviews-only'        => false,
+            'show-ratings'        => false,
+            'show-pub-date'       => true,
+            'show-goodreads-link' => false,
+            'show-purchase-links' => false,
+            'show-review-link'    => false,
+            'orderby'             => 'book.id',
+            'order'               => 'DESC',
+            'cover-size'          => 'large',
+            'per-page'            => 20,
+        );
+
+        foreach (get_book_taxonomies(array('fields' => 'slug')) as $tax_slug) {
+            $default_atts[$tax_slug] = '';
+        }
+
+        $atts = shortcode_atts($default_atts, $atts, 'book-grid');
+
+        // Validate booleans.
+        $booleans = array(
+            'reviews-only', 'show-ratings', 'show-pub-date', 'show-goodreads-link', 'show-purchase-links',
+            'show-review-link'
+        );
+        foreach ($booleans as $boolean) {
+            $atts[$boolean] = filter_var($atts[$boolean], FILTER_VALIDATE_BOOLEAN);
+        }
+
+        // Replace "review-start-date" and "review-end-date".
+        if (! empty($atts['review-start-date'])) {
+            $atts['review-date-after'] = $atts['review-start-date'];
+        }
+        if (! empty($atts['review-end-date'])) {
+            $atts['review-date-before'] = $atts['review-end-date'];
+        }
+
+        $query = new Book_Grid_Query($atts);
+
+        ob_start();
+        ?>
+        <div id="bdb-books">
+            <?php
+            $books    = $query->get_results();
+            $template = get_book_template_part('shortcode-book-grid-entry', '', false);
+
+            if (! empty($books)) {
+                echo '<div class="bdb-book-list-number-results bdb-book-grid-number-results">'.sprintf(_n('%s book found',
+                        '%s books found', $query->total_results, 'book-database'), $query->total_results).'</div>';
+                echo '<div class="bdb-book-list bdb-book-grid">';
+                foreach ($books as $book_data) {
+                    $book   = new Book($book_data);
+                    $review = false;
+
+                    // Create a review object if we can.
+                    if (! empty($book_data->review_id)) {
+                        $review_data = array(
+                            'id'             => $book_data->review_id ?? 0,
+                            'book_id'        => $book->get_id(),
+                            'reading_log_id' => $book_data->review_reading_log_id ?? null,
+                            'user_id'        => $book_data->review_user_id ?? null,
+                            'post_id'        => $book_data->review_post_id ?? null,
+                            'url'            => $book_data->review_url ?? '',
+                            'review'         => $book_data->review_review ?? '',
+                            'date_written'   => $book_data->review_date_written ?? '',
+                            'date_published' => $book_data->review_date_published ?? null,
+                            'date_created'   => $book_data->review_date_created ?? '',
+                            'date_modified'  => $book_data->review_date_modified ?? ''
+                        );
+
+                        $review = new Review($review_data);
+                    }
+
+                    include $template;
+                }
+                echo '</div>';
+            } else {
+                ?>
+                <p><?php _e('No books found.', 'book-database'); ?></p>
+                <?php
+            }
+
+            if ($query->total_results > count($books)) {
+                ?>
+                <nav class="bdb-pagination bdb-book-grid-pagination pagination">
+                    <?php echo $query->get_pagination(); ?>
+                </nav>
+            <?php } ?>
+        </div>
+        <?php
+        return ob_get_clean();
+    }
+}
diff --git a/src/Shortcodes/BookReviewsShortcode.php b/src/Shortcodes/BookReviewsShortcode.php
new file mode 100644
index 00000000..455afca3
--- /dev/null
+++ b/src/Shortcodes/BookReviewsShortcode.php
@@ -0,0 +1,296 @@
+<?php
+/**
+ * BookReviewsShortcode.php
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ * @since     1.3
+ */
+
+namespace Book_Database\Shortcodes;
+
+use Book_Database\Book_Reviews_Query;
+use Book_Database\Models\Author;
+use Book_Database\Models\Book;
+use Book_Database\Models\BookTaxonomy;
+use Book_Database\Models\BookTerm;
+use Book_Database\Models\ReadingLog;
+use Book_Database\Models\Review;
+use Book_Database\Models\Series;
+use Book_Database\ValueObjects\Rating;
+use function Book_Database\get_available_ratings;
+use function Book_Database\get_book_author_by;
+use function Book_Database\get_book_series_by;
+use function Book_Database\get_book_taxonomy_by;
+use function Book_Database\get_book_template_part;
+use function Book_Database\get_book_term_by;
+use function Book_Database\get_book_terms;
+use function Book_Database\get_review_years;
+
+class BookReviewsShortcode implements Shortcode
+{
+
+    public static function tag(): string
+    {
+        return 'book-reviews';
+    }
+
+    public function make($atts, $content = ''): string
+    {
+        global $wp_query;
+
+        $atts = shortcode_atts(array(
+            'hide-future' => true,
+            'per-page'    => 20,
+            'filters'     => 'book_title book_author book_series rating genre publisher review_year orderby order',
+            'cover-size'  => 'medium',
+        ), $atts, 'book-reviews');
+
+        $atts['hide-future'] = filter_var($atts['hide-future'], FILTER_VALIDATE_BOOLEAN);
+
+        $query   = new Book_Reviews_Query($atts);
+        $filters = explode(' ', $atts['filters']);
+
+        ob_start();
+        ?>
+        <form id="bdb-filter-book-reviews" action="<?php echo esc_url(get_permalink()); ?>" method="GET">
+            <div class="bdb-filters">
+                <?php foreach ($filters as $filter) : ?>
+                    <div class="bdb-filter-option">
+                        <?php
+                        switch ($filter) {
+                            case 'book_title' :
+                                $title = '';
+                                if (! empty($_GET['title'])) {
+                                    $title = wp_strip_all_tags($_GET['title']);
+                                }
+                                ?>
+                                <label for="bdb-book-title"><?php _e('Book Title', 'book-database'); ?></label>
+                                <input type="text" id="bdb-book-title" name="title" value="<?php echo esc_attr($title); ?>">
+                                <?php
+                                break;
+
+                            case 'book_author' :
+                                $author = '';
+                                if (! empty($_GET['author'])) {
+                                    $author = wp_strip_all_tags($_GET['author']);
+                                } elseif (! empty($wp_query->query_vars['book_tax']) && 'author' === $wp_query->query_vars['book_tax'] && ! empty($wp_query->query_vars['book_term'])) {
+                                    $slug   = $wp_query->query_vars['book_term'];
+                                    $author = get_book_author_by('slug', $slug);
+                                    $author = $author instanceof Author ? $author->get_name() : '';
+                                }
+                                ?>
+                                <label for="bdb-book-author"><?php _e('Book Author', 'book-database'); ?></label>
+                                <input type="text" id="bdb-book-author" name="author" value="<?php echo esc_attr($author); ?>">
+                                <?php
+                                break;
+
+                            case 'book_series' :
+                                $series = '';
+                                if (! empty($_GET['series'])) {
+                                    $series = wp_strip_all_tags($_GET['series']);
+                                } elseif (! empty($wp_query->query_vars['book_tax']) && 'series' === $wp_query->query_vars['book_tax'] && ! empty($wp_query->query_vars['book_term'])) {
+                                    $slug   = $wp_query->query_vars['book_term'];
+                                    $series = get_book_series_by('slug', $slug);
+                                    $series = $series instanceof Series ? $series->get_name() : '';
+                                }
+                                ?>
+                                <label for="bdb-book-series"><?php _e('Book Series', 'book-database'); ?></label>
+                                <input type="text" id="bdb-book-series" name="series" value="<?php echo esc_attr($series); ?>">
+                                <?php
+                                break;
+
+                            case 'rating' :
+                                $selected_rating = 'any';
+                                if (! empty($_GET['rating'])) {
+                                    $selected_rating = wp_strip_all_tags($_GET['rating']);
+                                } elseif (! empty($wp_query->query_vars['book_tax']) && 'rating' === $wp_query->query_vars['book_tax'] && ! empty($wp_query->query_vars['book_term'])) {
+                                    $selected_rating = $wp_query->query_vars['book_term'];
+                                }
+                                ?>
+                                <label for="bdb-book-rating"><?php esc_html_e('Rating', 'book-database'); ?></label>
+                                <select id="bdb-book-rating" name="rating">
+                                    <option value="any" <?php selected($selected_rating, 'any'); ?>>
+                                        <?php esc_html_e('Any', 'book-database'); ?>
+                                    </option>
+                                    <?php foreach (get_available_ratings() as $rating_value => $rating) :
+                                        $rating_object = new Rating($rating_value);
+                                        ?>
+                                        <option
+                                            value="<?php echo esc_attr($rating_value); ?>"
+                                            <?php selected($selected_rating, $rating_value); ?>
+                                        >
+                                            <?php echo esc_html($rating_object->format_text()); ?>
+                                        </option>
+                                    <?php endforeach; ?>
+                                </select>
+                                <?php
+                                break;
+
+                            case 'review_year' :
+                                $years = get_review_years('published');
+                                $selected_year = $_GET['review_year'] ?? 'any';
+                                ?>
+                                <label for="bdb-book-review-year"><?php _e('Review Year', 'book-database'); ?></label>
+                                <select id="bdb-book-review-year" name="review_year">
+                                    <option value="any" <?php selected($selected_year, 'any'); ?>>
+                                        <?php esc_html_e('Any', 'book-database'); ?>
+                                    </option>
+                                    <?php foreach ($years as $year) : ?>
+                                        <option
+                                            value="<?php echo esc_attr($year); ?>"
+                                            <?php selected($selected_year, $year); ?>
+                                        >
+                                            <?php echo esc_html($year); ?>
+                                        </option>
+                                    <?php endforeach; ?>
+                                </select>
+                                <?php
+                                break;
+
+                            case 'orderby' :
+                                $orderby = $_GET['orderby'] ?? 'review.date_published';
+                                ?>
+                                <label for="bdb-orderby"><?php _e('Order By', 'book-database'); ?></label>
+                                <select id="bdb-orderby" name="orderby">
+                                    <option value="author.name" <?php selected($orderby, 'author.name'); ?>>
+                                        <?php esc_html_e('Author Name', 'book-database'); ?>
+                                    </option>
+                                    <option value="book.title" <?php selected($orderby, 'book.title'); ?>>
+                                        <?php esc_html_e('Book Title', 'book-database'); ?>
+                                    </option>
+                                    <option value="book.pub_date" <?php selected($orderby, 'book.pub_date'); ?>>
+                                        <?php esc_html_e('Book Publish Date', 'book-database'); ?>
+                                    </option>
+                                    <option value="log.date_finished" <?php selected($orderby, 'log.date_finished'); ?>>
+                                        <?php esc_html_e('Date Read', 'book-database'); ?>
+                                    </option>
+                                    <option value="review.date_published" <?php selected($orderby, 'review.date_published'); ?>>
+                                        <?php esc_html_e('Date Reviewed', 'book-database'); ?>
+                                    </option>
+                                    <option value="book.pages" <?php selected($orderby, 'book.pages'); ?>>
+                                        <?php esc_html_e('Number of Pages', 'book-database'); ?>
+                                    </option>
+                                    <option value="log.rating" <?php selected($orderby, 'log.rating'); ?>>
+                                        <?php esc_html_e('Rating', 'book-database'); ?>
+                                    </option>
+                                </select>
+                                <?php
+                                break;
+
+                            case 'order' :
+                                $order = $_GET['order'] ?? 'DESC';
+                                ?>
+                                <label for="bdb-order"><?php _e('Order', 'book-database'); ?></label>
+                                <select id="bdb-order" name="order">
+                                    <option value="ASC" <?php selected($order, 'ASC'); ?>>
+                                        <?php esc_html_e('ASC (1, 2, 3; a, b, c)', 'book-database'); ?>
+                                    </option>
+                                    <option value="DESC" <?php selected($order, 'DESC'); ?>>
+                                        <?php esc_html_e('DESC (3, 2, 1; c, b, a)', 'book-database'); ?>
+                                    </option>
+                                </select>
+                                <?php
+                                break;
+
+                            // Taxonomies
+                            default :
+                                $taxonomy = get_book_taxonomy_by('slug', $filter);
+
+                                if (! $taxonomy instanceof BookTaxonomy) {
+                                    break;
+                                }
+
+                                $terms = get_book_terms(array(
+                                    'taxonomy' => $taxonomy->get_slug(),
+                                    'number'   => 300,
+                                    'orderby'  => 'name',
+                                    'order'    => 'ASC'
+                                ));
+
+                                $selected_term = 'any';
+                                if (! empty($_GET[$taxonomy->get_slug()])) {
+                                    $selected_term = wp_strip_all_tags($_GET[$taxonomy->get_slug()]);
+                                } elseif (! empty($wp_query->query_vars['book_tax']) && $taxonomy->get_slug() === $wp_query->query_vars['book_tax'] && ! empty($wp_query->query_vars['book_term'])) {
+                                    $slug = $wp_query->query_vars['book_term'];
+                                    $term = get_book_term_by('slug', $slug);
+
+                                    if ($term instanceof BookTerm) {
+                                        $selected_term = $term->get_id();
+                                    }
+                                }
+                                ?>
+                                <label for="bdb-<?php echo esc_attr($taxonomy->get_slug()); ?>"><?php echo esc_html($taxonomy->get_name()) ?></label>
+                                <select id="bdb-<?php echo esc_attr($taxonomy->get_slug()); ?>" name="<?php echo esc_attr($taxonomy->get_slug()); ?>">
+                                    <option value="any" <?php selected($selected_term, 'any'); ?>>
+                                        <?php esc_html_e('Any', 'book-database'); ?>
+                                    </option>
+                                    <?php foreach ($terms as $term) : ?>
+                                        <option
+                                            value="<?php echo esc_attr($term->get_id()); ?>"
+                                            <?php selected($selected_term, $term->get_id()); ?>
+                                        >
+                                            <?php echo esc_html($term->get_name()); ?>
+                                        </option>
+                                    <?php endforeach; ?>
+                                </select>
+                                <?php
+                                break;
+                        }
+                        ?>
+                    </div>
+                <?php endforeach; ?>
+            </div>
+            <div class="bdb-filter-actions">
+                <button type="submit"><?php _e('Filter', 'book-database'); ?></button>
+                <a href="<?php echo esc_url(get_permalink()); ?>" class="bdb-reset-search-filters">
+                    <?php esc_html_e('Clear filters &times;', 'book-database'); ?>
+                </a>
+            </div>
+        </form>
+        <div id="bdb-reviews">
+            <?php
+            $reviews  = $query->get_results();
+            $template = get_book_template_part('shortcode-book-reviews-entry', '', false);
+
+            if (! empty($reviews)) {
+                echo '<div class="bdb-review-list-number-results bdb-book-grid-number-results">'.sprintf(_n('%s review found',
+                        '%s reviews found', $query->total_results, 'book-database'), $query->total_results).'</div>';
+                echo '<div class="bdb-book-reviews-list bdb-book-grid">';
+                foreach ($reviews as $review_data) {
+                    $review      = new Review($review_data);
+                    $book        = new Book(array(
+                        'id'              => $review_data->book_id ?? 0,
+                        'cover_id'        => $review_data->book_cover_id ?? null,
+                        'title'           => $review_data->book_title ?? '',
+                        'pub_date'        => $review_data->book_pub_date ?? '',
+                        'series_position' => $review_data->series_position ?? ''
+                    ));
+                    $reading_log = new ReadingLog(array(
+                        'date_started'        => $review_data->date_started_reading ?? null,
+                        'date_finished'       => $review_data->date_finished_reading ?? null,
+                        'percentage_complete' => $review_data->percentage_complete ?? null,
+                        'rating'              => $review_data->rating ?? null
+                    ));
+                    include $template;
+                }
+                echo '</div>';
+            } else {
+                ?>
+                <p><?php esc_html_e('No reviews found.', 'book-database'); ?></p>
+                <?php
+            }
+
+            if ($query->total_results > count($reviews)) {
+                ?>
+                <nav class="bdb-pagination bookdb-reviews-list-pagination pagination">
+                    <?php echo $query->get_pagination(); ?>
+                </nav>
+            <?php } ?>
+        </div>
+        <?php
+
+        return ob_get_clean();
+    }
+}
diff --git a/src/Shortcodes/BookShortcode.php b/src/Shortcodes/BookShortcode.php
new file mode 100644
index 00000000..1381010b
--- /dev/null
+++ b/src/Shortcodes/BookShortcode.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * BookShortcode.php
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ * @since     1.3
+ */
+
+namespace Book_Database\Shortcodes;
+
+use Book_Database\Book_Layout;
+use Book_Database\Models\Book;
+use function Book_Database\get_book;
+
+class BookShortcode implements Shortcode
+{
+
+    public static function tag(): string
+    {
+        return 'book';
+    }
+
+    public function make($atts, $content = ''): string
+    {
+        $atts = shortcode_atts(array(
+            'id'     => 0,
+            'rating' => null,
+        ), $atts, 'book');
+
+        if (empty($atts['id']) || ! is_numeric($atts['id'])) {
+            return sprintf(__('Invalid book: %s', 'book-database'), $atts['id']);
+        }
+
+        $book = get_book(absint($atts['id']));
+
+        if (! $book instanceof Book) {
+            return sprintf(__('Invalid book: %s', 'book-database'), $atts['id']);
+        }
+
+        $layout = new Book_Layout($book);
+        $layout->set_rating($atts['rating']);
+
+        $html = $layout->get_html();
+
+        /**
+         * Filters the [book] shortcode HTML.
+         *
+         * @param  string  $html  Formatted book layout.
+         * @param  Book  $book  Book object.
+         * @param  array  $atts  Shortcode attributes.
+         * @param  string  $content  Shortcode content.
+         */
+        return apply_filters('book-database/shortcodes/book/output', $html, $book, $atts, $content);
+    }
+}
diff --git a/src/Shortcodes/Shortcode.php b/src/Shortcodes/Shortcode.php
new file mode 100644
index 00000000..b9149910
--- /dev/null
+++ b/src/Shortcodes/Shortcode.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Shortcode.php
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ * @since     1.3
+ */
+
+namespace Book_Database\Shortcodes;
+
+interface Shortcode
+{
+    /**
+     * Shortcode tag name.
+     *
+     * @since 1.3
+     *
+     * @return string
+     */
+    public static function tag(): string;
+
+    /**
+     * Callback for rendering the shortcode.
+     *
+     * @since 1.3
+     *
+     * @param  array  $atts
+     * @param  string  $content
+     *
+     * @return string
+     */
+    public function make($atts, $content = ''): string;
+
+}
diff --git a/src/Traits/HasQueryInterface.php b/src/Traits/HasQueryInterface.php
new file mode 100644
index 00000000..ae2a8f91
--- /dev/null
+++ b/src/Traits/HasQueryInterface.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * HasQueryInterface.php
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ * @since     1.3
+ */
+
+namespace Book_Database\Traits;
+
+use Book_Database\BerlinDB\Database\Query;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Exceptions\ModelNotFoundException;
+use Book_Database\Models\Model;
+
+trait HasQueryInterface
+{
+    /**
+     * @var string
+     */
+    protected static $queryInterfaceClass;
+
+    /**
+     * Returns the query interface for this model.
+     *
+     * @since 1.3
+     *
+     * @return Query
+     * @throws \Exception
+     */
+    protected static function getQueryInterface(): Query
+    {
+        if (! isset(static::$queryInterfaceClass)) {
+            throw new \Exception('Query class not set for '.static::class);
+        }
+
+        if (! is_subclass_of(static::$queryInterfaceClass, Query::class)) {
+            throw new \Exception(sprintf(
+                'The %s class must extend %s.',
+                static::$queryInterfaceClass,
+                Query::class
+            ));
+        }
+
+        return new static::$queryInterfaceClass;
+    }
+
+    /**
+     * Creates a new model.
+     *
+     * @since 1.3
+     *
+     * @param  array  $args
+     *
+     * @return int
+     * @throws \Exception
+     */
+    public static function create(array $args): int
+    {
+        $id = static::getQueryInterface()->add_item($args);
+
+        if ($id) {
+            return (int) $id;
+        }
+
+        throw new Exception(
+            'database_error',
+            __('Failed to insert new model into the database.', 'book-database'),
+            500
+        );
+    }
+
+    /**
+     * Updates a model by its ID.
+     *
+     * @since 1.3
+     *
+     * @param  int  $id
+     * @param  array  $args
+     *
+     * @return bool
+     * @throws \Exception
+     */
+    public static function update(int $id, array $args): bool
+    {
+        return (bool) static::getQueryInterface()->update_item($id, $args);
+    }
+
+    /**
+     * Deletes a model by its ID.
+     *
+     * @since 1.3
+     *
+     * @param  int  $id
+     *
+     * @throws \Exception
+     */
+    public static function delete(int $id): void
+    {
+        if (! static::getQueryInterface()->delete_item($id)) {
+            throw new \Exception('Failed to delete model.');
+        }
+    }
+
+    /**
+     * Retrieves a model by its ID.
+     *
+     * @since 1.3
+     *
+     * @param  int  $id
+     *
+     * @return Model
+     * @throws ModelNotFoundException|\Exception
+     */
+    public static function find(int $id): Model
+    {
+        $item = static::getQueryInterface()->get_item($id);
+
+        if (! $item) {
+            throw new ModelNotFoundException();
+        }
+
+        return $item;
+    }
+
+    /**
+     * Retrieves a model by a given column + value.
+     *
+     * @since 1.3
+     *
+     * @param  string  $column
+     * @param  mixed  $value
+     *
+     * @return Model
+     * @throws ModelNotFoundException|\Exception
+     */
+    public static function findBy(string $column, $value): Model
+    {
+        $item = static::getQueryInterface()->get_item_by($column, $value);
+
+        if (! $item) {
+            throw new ModelNotFoundException();
+        }
+
+        return $item;
+    }
+
+    /**
+     * Queries for models.
+     *
+     * @since 1.3
+     *
+     * @param  array  $args
+     *
+     * @return Model[]|array
+     * @throws \Exception
+     */
+    public static function query(array $args = []): array
+    {
+        return static::getQueryInterface()->query($args);
+    }
+
+    /**
+     * Queries for all models.
+     *
+     * @since 1.3
+     *
+     * @param  array  $args
+     *
+     * @return Model[]|array
+     * @throws \Exception
+     */
+    public static function all(array $args = []): array
+    {
+        return static::query(wp_parse_args($args, ['number' => 9999]));
+    }
+
+    /**
+     * Counts the number of models.
+     *
+     * @since 1.3
+     *
+     * @param  array  $args
+     *
+     * @return int
+     * @throws \Exception
+     */
+    public static function count(array $args = []): int
+    {
+        $args  = wp_parse_args($args, ['count' => true]);
+        $query = static::getQueryInterface();
+        $query->query($args);
+
+        return absint($query->found_items);
+    }
+
+}
diff --git a/src/ValueObjects/Rating.php b/src/ValueObjects/Rating.php
new file mode 100644
index 00000000..46ced014
--- /dev/null
+++ b/src/ValueObjects/Rating.php
@@ -0,0 +1,289 @@
+<?php
+/**
+ * Rating Object
+ *
+ * @package   book-database
+ * @copyright Copyright (c) 2021, Ashley Gibson
+ * @license   GPL2+
+ */
+
+namespace Book_Database\ValueObjects;
+
+use function Book_Database\get_available_ratings;
+
+/**
+ * Class Rating
+ *
+ * @package Book_Database
+ * @since 1.3 Namespace changed.
+ */
+class Rating
+{
+
+    /**
+     * Raw rating value from the database
+     *
+     * @var null|float|int
+     */
+    protected $rating;
+
+    /**
+     * Highest possible rating
+     *
+     * @var float|int
+     */
+    protected $max;
+
+    /**
+     * Available ratings
+     *
+     * @var array
+     */
+    protected $available_ratings;
+
+    /**
+     * Rating constructor.
+     *
+     * @param  null|float|int  $rating
+     */
+    public function __construct($rating = null)
+    {
+        $this->set_rating($rating);
+        $this->available_ratings = get_available_ratings();
+        $this->max               = max(array_keys($this->available_ratings));
+    }
+
+    /**
+     * Set the rating
+     *
+     * @param  null|float|int  $rating  Rating value to set.
+     */
+    public function set_rating($rating): void
+    {
+        if (is_null($rating)) {
+            $this->rating = null;
+        } elseif (is_numeric($rating)) {
+            $this->rating = $rating + 0;
+        } else {
+            $this->rating = $rating;
+        }
+    }
+
+    /**
+     * Get the raw rating
+     *
+     * @return float|int|null
+     */
+    public function get_rating()
+    {
+        return $this->rating;
+    }
+
+    /**
+     * Get the highest possible rating
+     *
+     * @return float|int
+     */
+    public function get_max_rating()
+    {
+        return $this->max;
+    }
+
+    /**
+     * Round the rating to the nearest half
+     *
+     * @return float|int|null
+     */
+    public function round_rating()
+    {
+        $rating = $this->rating;
+
+        if (! is_numeric($rating)) {
+            return null;
+        }
+
+        if (! array_key_exists((string) $rating, $this->available_ratings)) {
+            $rating = round($this->rating * 2) / 2;
+        }
+
+        return $rating;
+    }
+
+    /**
+     * Format the rating
+     *
+     * @param  string  $format
+     *
+     * @return float|int|null
+     */
+    public function format(string $format = 'text')
+    {
+        $rating = $this->round_rating();
+
+        if (is_null($format) || ! is_numeric($rating)) {
+            return $rating;
+        } elseif (method_exists($this, 'format_'.$format)) {
+            return call_user_func(array($this, 'format_'.$format));
+        } else {
+            return $rating;
+        }
+    }
+
+    /**
+     * Format as text (with "Star(s)" appended)
+     *
+     * @return string
+     */
+    public function format_text(): string
+    {
+        if (null === $this->rating) {
+            $text = '&ndash;';
+        } elseif (! is_numeric($this->rating)) {
+            return $this->rating;
+        } else {
+            $text = $this->rating * 1;
+
+            if (array_key_exists((string) $text, $this->available_ratings)) {
+                $text = $this->available_ratings[(string) $text];
+            } else {
+                $text = sprintf(_n('%s Star', '%s Stars', $text, 'book-database'), $text);
+            }
+        }
+
+        /**
+         * Filters the text display.
+         *
+         * @param  string  $text
+         * @param  null|float|int  $rating
+         * @param  Rating  $this
+         */
+        return apply_filters('book-database/rating/format/text', $text, $this->rating, $this);
+    }
+
+    /**
+     * Format with Font Awesome stars
+     *
+     * @return string
+     */
+    public function format_font_awesome(): string
+    {
+        if (! is_numeric($this->rating)) {
+            return $this->format_text();
+        }
+
+        $font_awesome_rating = $this->repeat('<i class="fas fa-star"></i>', '<i class="fas fa-star-half-alt"></i>',
+            '<i class="far fa-star"></i>');
+
+        /**
+         * Filters the Font Awesome rating display.
+         *
+         * @param  string  $font_awesome_rating
+         * @param  null|float|int  $rating
+         * @param  Rating  $this
+         */
+        return apply_filters('book-database/rating/format/font_awesome', $font_awesome_rating, $this->rating, $this);
+    }
+
+    /**
+     * Format with HTML stars
+     *
+     * @return string
+     */
+    public function format_html_stars(): string
+    {
+        if (! is_numeric($this->rating)) {
+            return $this->format_text();
+        }
+
+        $html_stars = $this->repeat('&starf;', '&half;', '');
+
+        /**
+         * Filters the HTML stars display.
+         *
+         * @param  string  $html_stars
+         * @param  null|float|int  $rating
+         * @param  Rating  $this
+         */
+        return apply_filters('book-database/rating/format/html_stars', $html_stars, $this->rating, $this);
+    }
+
+    /**
+     * Format as HTML class name
+     *
+     * @return string
+     */
+    public function format_html_class(): string
+    {
+        $class  = '';
+        $rating = $this->round_rating();
+
+        switch ($rating) {
+            case '5' :
+                $class = 'five-stars';
+                break;
+            case '4.5' :
+                $class = 'four-half-stars';
+                break;
+            case '4' :
+                $class = 'four-stars';
+                break;
+            case '3.5' :
+                $class = 'three-half-stars';
+                break;
+            case '3' :
+                $class = 'three-stars';
+                break;
+            case '2.5' :
+                $class = 'two-half-stars';
+                break;
+            case '2' :
+                $class = 'two-stars';
+                break;
+            case '1.5' :
+                $class = 'one-half-stars';
+                break;
+            case '1' :
+                $class = 'one-star';
+                break;
+            case '0.5' :
+                $class = 'half-star';
+                break;
+            case '0' :
+                $class = 'zero-stars';
+                break;
+        }
+
+        /**
+         * Filters the HTML class display
+         *
+         * @param  string  $class
+         * @param  null|float|int  $rating
+         * @param  Rating  $this
+         */
+        return apply_filters('book-database/rating/format/html_class', $class, $this->rating, $this);
+    }
+
+    /**
+     * Repeat text/HTML for the number of stars
+     *
+     * @param  string  $full_star  Text/HTML to use for full stars.
+     * @param  string  $half_star  Text/HTML to use for half stars.
+     * @param  string  $empty_star  Text/HTML to use for empty stars.
+     *
+     * @return string
+     */
+    public function repeat(string $full_star, string $half_star = '', string $empty_star = ''): string
+    {
+        $rating      = $this->round_rating();
+        $full_stars  = floor($rating);
+        $half_stars  = ceil($rating - $full_stars);
+        $empty_stars = $this->max - $full_stars - $half_stars;
+
+        $output = str_repeat($full_star, $full_stars);
+        $output .= str_repeat($half_star, $half_stars);
+        $output .= str_repeat($empty_star, $empty_stars);
+
+        return $output;
+    }
+
+}
diff --git a/includes/widgets/Reading_Log.php b/src/Widgets/Reading_Log.php
similarity index 96%
rename from includes/widgets/Reading_Log.php
rename to src/Widgets/Reading_Log.php
index d6c1dc1c..0f7c9c20 100644
--- a/includes/widgets/Reading_Log.php
+++ b/src/Widgets/Reading_Log.php
@@ -3,15 +3,15 @@
  * Reading Log Widget
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  * @since     1.1
  */
 
 namespace Book_Database\Widgets;
 
-use Book_Database\Book;
-use Book_Database\Rating;
+use Book_Database\Models\Book;
+use Book_Database\ValueObjects\Rating;
 use function Book_Database\book_database;
 use function Book_Database\get_book;
 
@@ -66,7 +66,7 @@ public function widget( $args, $instance ) {
 	 *
 	 * @param array $args
 	 *
-	 * @return \Book_Database\Reading_Log[]
+	 * @return \Book_Database\Models\ReadingLog[]
 	 */
 	protected function query_reading_logs( $args ) {
 
@@ -97,7 +97,7 @@ protected function query_reading_logs( $args ) {
 
 		if ( ! empty( $results ) ) {
 			foreach ( $results as $key => $result ) {
-				$results[ $key ] = new \Book_Database\Reading_Log( $result );
+				$results[ $key ] = new \Book_Database\Models\ReadingLog( $result );
 			}
 		}
 
@@ -108,7 +108,7 @@ protected function query_reading_logs( $args ) {
 	/**
 	 * Displays results
 	 *
-	 * @param \Book_Database\Reading_Log[] $logs
+	 * @param \Book_Database\Models\ReadingLog[] $logs
 	 * @param array                        $args
 	 */
 	protected function display_books( $logs, $args ) {
@@ -157,7 +157,7 @@ protected function display_books( $logs, $args ) {
 	/**
 	 * Displays start and finish dates if enabled
 	 *
-	 * @param \Book_Database\Reading_Log $log
+	 * @param \Book_Database\Models\ReadingLog $log
 	 * @param array                      $args
 	 */
 	protected function maybe_show_dates( $log, $args ) {
@@ -194,7 +194,7 @@ protected function maybe_show_dates( $log, $args ) {
 	/**
 	 * Displays rating if enabled
 	 *
-	 * @param \Book_Database\Reading_Log $log
+	 * @param \Book_Database\Models\ReadingLog $log
 	 * @param array                      $args
 	 */
 	protected function maybe_show_rating( $log, $args ) {
@@ -325,4 +325,4 @@ public function update( $new_instance, $old_instance ) {
  */
 add_action( 'widgets_init', function () {
 	register_widget( '\\Book_Database\\Widgets\\Reading_log' );
-} );
\ No newline at end of file
+} );
diff --git a/includes/widgets/Reviews.php b/src/Widgets/Reviews.php
similarity index 97%
rename from includes/widgets/Reviews.php
rename to src/Widgets/Reviews.php
index 00d7c76a..fe01b74b 100644
--- a/includes/widgets/Reviews.php
+++ b/src/Widgets/Reviews.php
@@ -3,17 +3,17 @@
  * Reviews Widget
  *
  * @package   book-database
- * @copyright Copyright (c) 2020, Ashley Gibson
+ * @copyright Copyright (c) 2021, Ashley Gibson
  * @license   GPL2+
  * @since     1.1
  */
 
 namespace Book_Database\Widgets;
 
-use Book_Database\Book;
-use Book_Database\Rating;
-use Book_Database\Review;
-use Book_Database\Reviews_Query;
+use Book_Database\Models\Book;
+use Book_Database\ValueObjects\Rating;
+use Book_Database\Models\Review;
+use Book_Database\Database\Reviews\ReviewsQuery;
 
 /**
  * Class Reviews
@@ -105,7 +105,7 @@ protected function query_reviews( $args ) {
 			);
 		}
 
-		$query = new Reviews_Query();
+		$query = new ReviewsQuery();
 
 		return $query->get_reviews( $query_args );
 
@@ -324,4 +324,4 @@ public function update( $new_instance, $old_instance ) {
  */
 add_action( 'widgets_init', function () {
 	register_widget( '\\Book_Database\\Widgets\\Reviews' );
-} );
\ No newline at end of file
+} );
diff --git a/templates/shortcode-book-grid-entry.php b/templates/shortcode-book-grid-entry.php
index 77ac93c0..6c9184c4 100644
--- a/templates/shortcode-book-grid-entry.php
+++ b/templates/shortcode-book-grid-entry.php
@@ -9,6 +9,10 @@
 
 namespace Book_Database;
 
+use Book_Database\Models\Book;
+use Book_Database\Models\Review;
+use Book_Database\ValueObjects\Rating;
+
 /**
  * @var array        $atts      Shortcode attributes.
  * @var Book         $book      Book object.
diff --git a/templates/shortcode-book-reviews-entry.php b/templates/shortcode-book-reviews-entry.php
index 4fb94242..49f1026c 100644
--- a/templates/shortcode-book-reviews-entry.php
+++ b/templates/shortcode-book-reviews-entry.php
@@ -9,11 +9,16 @@
 
 namespace Book_Database;
 
+use Book_Database\Models\Book;
+use Book_Database\Models\ReadingLog;
+use Book_Database\Models\Review;
+use Book_Database\ValueObjects\Rating;
+
 /**
  * @var array       $atts        Shortcode attributes.
  * @var Book        $book        Book object.
  * @var Review      $review      Review object.
- * @var Reading_Log $reading_log Reading log object.
+ * @var ReadingLog $reading_log Reading log object.
  * @var object      $review_data Full object from the database.
  */
 
diff --git a/tests/books/test-book-functions.php b/tests/books/test-book-functions.php
index 3080f8a5..7c2e6118 100644
--- a/tests/books/test-book-functions.php
+++ b/tests/books/test-book-functions.php
@@ -9,8 +9,8 @@
 
 namespace Book_Database\Tests;
 
-use Book_Database\Book;
-use Book_Database\Exception;
+use Book_Database\Models\Book;
+use Book_Database\Exceptions\Exception;
 use function Book_Database\add_book;
 use function Book_Database\add_book_series;
 use function Book_Database\get_book;
@@ -77,21 +77,21 @@ public function test_create_book_without_title_throws_exception() {
 	 * @covers ::get_book
 	 */
 	public function test_get_book() {
-		$this->assertInstanceOf( 'Book_Database\Book', get_book( self::$book_id ) );
+		$this->assertInstanceOf( 'Book_Database\Models\Book', get_book( self::$book_id ) );
 	}
 
 	/**
 	 * @covers ::get_book_by
 	 */
 	public function test_get_book_by_title() {
-		$this->assertInstanceOf( 'Book_Database\Book', get_book_by( 'title', 'The First Book' ) );
+		$this->assertInstanceOf( 'Book_Database\Models\Book', get_book_by( 'title', 'The First Book' ) );
 	}
 
 	/**
 	 * @covers ::get_book_by
 	 */
 	public function test_get_book_by_index_title() {
-		$this->assertInstanceOf( 'Book_Database\Book', get_book_by( 'index_title', 'First Book, The' ) );
+		$this->assertInstanceOf( 'Book_Database\Models\Book', get_book_by( 'index_title', 'First Book, The' ) );
 	}
 
 	/**
@@ -100,7 +100,7 @@ public function test_get_book_by_index_title() {
 	public function test_get_books_array_of_book_objects() {
 		$books = get_books();
 
-		$this->assertInstanceOf( 'Book_Database\Book', $books[0] );
+		$this->assertInstanceOf( 'Book_Database\Models\Book', $books[0] );
 	}
 
 	/**
@@ -172,4 +172,4 @@ public function test_add_book_with_series_position_float() {
 		$this->assertEquals( 1.5, $integer_book->get_series_position() );
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/books/test-book-object.php b/tests/books/test-book-object.php
index c02b27ee..f4ca07b3 100644
--- a/tests/books/test-book-object.php
+++ b/tests/books/test-book-object.php
@@ -9,7 +9,7 @@
 
 namespace Book_Database\Tests;
 
-use Book_Database\Book;
+use Book_Database\Models\Book;
 use function Book_Database\add_book;
 use function Book_Database\add_book_series;
 use function Book_Database\get_book;
@@ -104,4 +104,4 @@ public function test_pages() {
 		$this->assertEquals( 123, self::$book->get_pages() );
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 3b365433..5f8b4758 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -16,7 +16,7 @@
 
 define( 'BDB_DOING_TESTS', true );
 
-require_once dirname(__FILE__) . '/../vendor/autoload.php';
+require_once dirname( dirname( __FILE__ ) ) . '/vendor/autoload.php';
 
 $_tests_dir = getenv( 'WP_TESTS_DIR' );
 if ( ! $_tests_dir ) $_tests_dir = '/tmp/wordpress-tests-lib';
diff --git a/tests/phpunit/factories/class-book-factory.php b/tests/phpunit/factories/class-book-factory.php
index 5f4575d7..bac34734 100644
--- a/tests/phpunit/factories/class-book-factory.php
+++ b/tests/phpunit/factories/class-book-factory.php
@@ -9,8 +9,8 @@
 
 namespace Book_Database\Tests\Factory;
 
-use Book_Database\Book;
-use Book_Database\Exception;
+use Book_Database\Models\Book;
+use Book_Database\Exceptions\Exception;
 use function Book_Database\add_book;
 use function Book_Database\get_book;
 use function Book_Database\update_book;
@@ -89,4 +89,4 @@ public function get_object_by_id( $object_id ) {
 		return get_book( $object_id );
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/phpunit/factories/class-series-factory.php b/tests/phpunit/factories/class-series-factory.php
index 4126284e..5cbce7dd 100644
--- a/tests/phpunit/factories/class-series-factory.php
+++ b/tests/phpunit/factories/class-series-factory.php
@@ -9,8 +9,8 @@
 
 namespace Book_Database\Tests\Factory;
 
-use Book_Database\Exception;
-use Book_Database\Series;
+use Book_Database\Exceptions\Exception;
+use Book_Database\Models\Series;
 use function Book_Database\add_book_series;
 use function Book_Database\get_book_series_by;
 use function Book_Database\update_book_series;
@@ -73,4 +73,4 @@ public function get_object_by_id( $object_id ) {
 		return get_book_series_by( 'id', $object_id );
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/series/test-series-functions.php b/tests/series/test-series-functions.php
index 83a22bce..04ad7032 100644
--- a/tests/series/test-series-functions.php
+++ b/tests/series/test-series-functions.php
@@ -9,7 +9,7 @@
 
 namespace Book_Database\Tests;
 
-use Book_Database\Series;
+use Book_Database\Models\Series;
 use function Book_Database\get_book_series_by;
 
 /**
@@ -48,21 +48,21 @@ public function setUp() {
 	 * @covers ::\Book_Database\get_book_series_by()
 	 */
 	public function test_get_series_by_id() {
-		$this->assertInstanceOf( 'Book_Database\Series', get_book_series_by( 'id', self::$series[0] ) );
+		$this->assertInstanceOf( 'Book_Database\Models\Series', get_book_series_by( 'id', self::$series[0] ) );
 	}
 
 	/**
 	 * @covers ::\Book_Database\get_book_series_by()
 	 */
 	public function test_get_series_by_name() {
-		$this->assertInstanceOf( 'Book_Database\Series', get_book_series_by( 'name', 'My Trilogy' ) );
+		$this->assertInstanceOf( 'Book_Database\Models\Series', get_book_series_by( 'name', 'My Trilogy' ) );
 	}
 
 	/**
 	 * @covers ::\Book_Database\get_book_series_by()
 	 */
 	public function test_get_series_by_slug() {
-		$this->assertInstanceOf( 'Book_Database\Series', get_book_series_by( 'slug', 'my-trilogy' ) );
+		$this->assertInstanceOf( 'Book_Database\Models\Series', get_book_series_by( 'slug', 'my-trilogy' ) );
 	}
 
 	/**
@@ -91,4 +91,4 @@ public function test_series_same_slug_should_append_number() {
 
 	}
 
-}
\ No newline at end of file
+}