diff --git a/charges/agnusDei.svg b/public/images/charges/agnusDei.svg
similarity index 100%
rename from charges/agnusDei.svg
rename to public/images/charges/agnusDei.svg
diff --git a/charges/anchor.svg b/public/images/charges/anchor.svg
similarity index 100%
rename from charges/anchor.svg
rename to public/images/charges/anchor.svg
diff --git a/charges/angel.svg b/public/images/charges/angel.svg
similarity index 100%
rename from charges/angel.svg
rename to public/images/charges/angel.svg
diff --git a/charges/annulet.svg b/public/images/charges/annulet.svg
similarity index 100%
rename from charges/annulet.svg
rename to public/images/charges/annulet.svg
diff --git a/charges/anvil.svg b/public/images/charges/anvil.svg
similarity index 100%
rename from charges/anvil.svg
rename to public/images/charges/anvil.svg
diff --git a/charges/apple.svg b/public/images/charges/apple.svg
similarity index 100%
rename from charges/apple.svg
rename to public/images/charges/apple.svg
diff --git a/charges/armillarySphere.svg b/public/images/charges/armillarySphere.svg
similarity index 100%
rename from charges/armillarySphere.svg
rename to public/images/charges/armillarySphere.svg
diff --git a/charges/arrow.svg b/public/images/charges/arrow.svg
similarity index 100%
rename from charges/arrow.svg
rename to public/images/charges/arrow.svg
diff --git a/charges/arrowsSheaf.svg b/public/images/charges/arrowsSheaf.svg
similarity index 100%
rename from charges/arrowsSheaf.svg
rename to public/images/charges/arrowsSheaf.svg
diff --git a/charges/attire.svg b/public/images/charges/attire.svg
similarity index 100%
rename from charges/attire.svg
rename to public/images/charges/attire.svg
diff --git a/charges/axe.svg b/public/images/charges/axe.svg
similarity index 100%
rename from charges/axe.svg
rename to public/images/charges/axe.svg
diff --git a/charges/basilisk.svg b/public/images/charges/basilisk.svg
similarity index 100%
rename from charges/basilisk.svg
rename to public/images/charges/basilisk.svg
diff --git a/charges/bearPassant.svg b/public/images/charges/bearPassant.svg
similarity index 100%
rename from charges/bearPassant.svg
rename to public/images/charges/bearPassant.svg
diff --git a/charges/bearRampant.svg b/public/images/charges/bearRampant.svg
similarity index 100%
rename from charges/bearRampant.svg
rename to public/images/charges/bearRampant.svg
diff --git a/charges/bell.svg b/public/images/charges/bell.svg
similarity index 100%
rename from charges/bell.svg
rename to public/images/charges/bell.svg
diff --git a/charges/billet.svg b/public/images/charges/billet.svg
similarity index 100%
rename from charges/billet.svg
rename to public/images/charges/billet.svg
diff --git a/charges/boarRampant.svg b/public/images/charges/boarRampant.svg
similarity index 100%
rename from charges/boarRampant.svg
rename to public/images/charges/boarRampant.svg
diff --git a/charges/boat.svg b/public/images/charges/boat.svg
similarity index 100%
rename from charges/boat.svg
rename to public/images/charges/boat.svg
diff --git a/charges/boat2.svg b/public/images/charges/boat2.svg
similarity index 100%
rename from charges/boat2.svg
rename to public/images/charges/boat2.svg
diff --git a/charges/bow.svg b/public/images/charges/bow.svg
similarity index 100%
rename from charges/bow.svg
rename to public/images/charges/bow.svg
diff --git a/charges/bowWithArrow.svg b/public/images/charges/bowWithArrow.svg
similarity index 100%
rename from charges/bowWithArrow.svg
rename to public/images/charges/bowWithArrow.svg
diff --git a/charges/bucket.svg b/public/images/charges/bucket.svg
similarity index 100%
rename from charges/bucket.svg
rename to public/images/charges/bucket.svg
diff --git a/charges/buckle.svg b/public/images/charges/buckle.svg
similarity index 100%
rename from charges/buckle.svg
rename to public/images/charges/buckle.svg
diff --git a/charges/bugleHorn.svg b/public/images/charges/bugleHorn.svg
similarity index 100%
rename from charges/bugleHorn.svg
rename to public/images/charges/bugleHorn.svg
diff --git a/charges/bugleHorn2.svg b/public/images/charges/bugleHorn2.svg
similarity index 100%
rename from charges/bugleHorn2.svg
rename to public/images/charges/bugleHorn2.svg
diff --git a/charges/bullHeadCaboshed.svg b/public/images/charges/bullHeadCaboshed.svg
similarity index 100%
rename from charges/bullHeadCaboshed.svg
rename to public/images/charges/bullHeadCaboshed.svg
diff --git a/charges/bullPassant.svg b/public/images/charges/bullPassant.svg
similarity index 100%
rename from charges/bullPassant.svg
rename to public/images/charges/bullPassant.svg
diff --git a/charges/camel.svg b/public/images/charges/camel.svg
similarity index 100%
rename from charges/camel.svg
rename to public/images/charges/camel.svg
diff --git a/charges/cancer.svg b/public/images/charges/cancer.svg
similarity index 100%
rename from charges/cancer.svg
rename to public/images/charges/cancer.svg
diff --git a/charges/cannon.svg b/public/images/charges/cannon.svg
similarity index 100%
rename from charges/cannon.svg
rename to public/images/charges/cannon.svg
diff --git a/charges/carreau.svg b/public/images/charges/carreau.svg
similarity index 100%
rename from charges/carreau.svg
rename to public/images/charges/carreau.svg
diff --git a/charges/castle.svg b/public/images/charges/castle.svg
similarity index 100%
rename from charges/castle.svg
rename to public/images/charges/castle.svg
diff --git a/charges/cavalier.svg b/public/images/charges/cavalier.svg
similarity index 100%
rename from charges/cavalier.svg
rename to public/images/charges/cavalier.svg
diff --git a/charges/chain.svg b/public/images/charges/chain.svg
similarity index 100%
rename from charges/chain.svg
rename to public/images/charges/chain.svg
diff --git a/charges/chalice.svg b/public/images/charges/chalice.svg
similarity index 100%
rename from charges/chalice.svg
rename to public/images/charges/chalice.svg
diff --git a/charges/cinquefoil.svg b/public/images/charges/cinquefoil.svg
similarity index 100%
rename from charges/cinquefoil.svg
rename to public/images/charges/cinquefoil.svg
diff --git a/charges/cock.svg b/public/images/charges/cock.svg
similarity index 100%
rename from charges/cock.svg
rename to public/images/charges/cock.svg
diff --git a/charges/compassRose.svg b/public/images/charges/compassRose.svg
similarity index 100%
rename from charges/compassRose.svg
rename to public/images/charges/compassRose.svg
diff --git a/charges/cowHorns.svg b/public/images/charges/cowHorns.svg
similarity index 100%
rename from charges/cowHorns.svg
rename to public/images/charges/cowHorns.svg
diff --git a/charges/crescent.svg b/public/images/charges/crescent.svg
similarity index 100%
rename from charges/crescent.svg
rename to public/images/charges/crescent.svg
diff --git a/charges/crosier.svg b/public/images/charges/crosier.svg
similarity index 100%
rename from charges/crosier.svg
rename to public/images/charges/crosier.svg
diff --git a/charges/crossAnkh.svg b/public/images/charges/crossAnkh.svg
similarity index 100%
rename from charges/crossAnkh.svg
rename to public/images/charges/crossAnkh.svg
diff --git a/charges/crossArrowed.svg b/public/images/charges/crossArrowed.svg
similarity index 100%
rename from charges/crossArrowed.svg
rename to public/images/charges/crossArrowed.svg
diff --git a/charges/crossAvellane.svg b/public/images/charges/crossAvellane.svg
similarity index 100%
rename from charges/crossAvellane.svg
rename to public/images/charges/crossAvellane.svg
diff --git a/charges/crossBiparted.svg b/public/images/charges/crossBiparted.svg
similarity index 100%
rename from charges/crossBiparted.svg
rename to public/images/charges/crossBiparted.svg
diff --git a/charges/crossBottony.svg b/public/images/charges/crossBottony.svg
similarity index 100%
rename from charges/crossBottony.svg
rename to public/images/charges/crossBottony.svg
diff --git a/charges/crossBurgundy.svg b/public/images/charges/crossBurgundy.svg
similarity index 100%
rename from charges/crossBurgundy.svg
rename to public/images/charges/crossBurgundy.svg
diff --git a/charges/crossCalvary.svg b/public/images/charges/crossCalvary.svg
similarity index 100%
rename from charges/crossCalvary.svg
rename to public/images/charges/crossCalvary.svg
diff --git a/charges/crossCarolingian.svg b/public/images/charges/crossCarolingian.svg
similarity index 100%
rename from charges/crossCarolingian.svg
rename to public/images/charges/crossCarolingian.svg
diff --git a/charges/crossCeltic.svg b/public/images/charges/crossCeltic.svg
similarity index 100%
rename from charges/crossCeltic.svg
rename to public/images/charges/crossCeltic.svg
diff --git a/charges/crossCeltic2.svg b/public/images/charges/crossCeltic2.svg
similarity index 100%
rename from charges/crossCeltic2.svg
rename to public/images/charges/crossCeltic2.svg
diff --git a/charges/crossCercelee.svg b/public/images/charges/crossCercelee.svg
similarity index 100%
rename from charges/crossCercelee.svg
rename to public/images/charges/crossCercelee.svg
diff --git a/charges/crossClechy.svg b/public/images/charges/crossClechy.svg
similarity index 100%
rename from charges/crossClechy.svg
rename to public/images/charges/crossClechy.svg
diff --git a/charges/crossDouble.svg b/public/images/charges/crossDouble.svg
similarity index 100%
rename from charges/crossDouble.svg
rename to public/images/charges/crossDouble.svg
diff --git a/charges/crossErminee.svg b/public/images/charges/crossErminee.svg
similarity index 100%
rename from charges/crossErminee.svg
rename to public/images/charges/crossErminee.svg
diff --git a/charges/crossFitchy.svg b/public/images/charges/crossFitchy.svg
similarity index 100%
rename from charges/crossFitchy.svg
rename to public/images/charges/crossFitchy.svg
diff --git a/charges/crossFleury.svg b/public/images/charges/crossFleury.svg
similarity index 100%
rename from charges/crossFleury.svg
rename to public/images/charges/crossFleury.svg
diff --git a/charges/crossFormee.svg b/public/images/charges/crossFormee.svg
similarity index 100%
rename from charges/crossFormee.svg
rename to public/images/charges/crossFormee.svg
diff --git a/charges/crossFormee2.svg b/public/images/charges/crossFormee2.svg
similarity index 100%
rename from charges/crossFormee2.svg
rename to public/images/charges/crossFormee2.svg
diff --git a/charges/crossFourchy.svg b/public/images/charges/crossFourchy.svg
similarity index 100%
rename from charges/crossFourchy.svg
rename to public/images/charges/crossFourchy.svg
diff --git a/charges/crossGamma.svg b/public/images/charges/crossGamma.svg
similarity index 100%
rename from charges/crossGamma.svg
rename to public/images/charges/crossGamma.svg
diff --git a/charges/crossHummetty.svg b/public/images/charges/crossHummetty.svg
similarity index 100%
rename from charges/crossHummetty.svg
rename to public/images/charges/crossHummetty.svg
diff --git a/charges/crossJerusalem.svg b/public/images/charges/crossJerusalem.svg
similarity index 100%
rename from charges/crossJerusalem.svg
rename to public/images/charges/crossJerusalem.svg
diff --git a/charges/crossLatin.svg b/public/images/charges/crossLatin.svg
similarity index 100%
rename from charges/crossLatin.svg
rename to public/images/charges/crossLatin.svg
diff --git a/charges/crossMaltese.svg b/public/images/charges/crossMaltese.svg
similarity index 100%
rename from charges/crossMaltese.svg
rename to public/images/charges/crossMaltese.svg
diff --git a/charges/crossMoline.svg b/public/images/charges/crossMoline.svg
similarity index 100%
rename from charges/crossMoline.svg
rename to public/images/charges/crossMoline.svg
diff --git a/charges/crossOccitan.svg b/public/images/charges/crossOccitan.svg
similarity index 100%
rename from charges/crossOccitan.svg
rename to public/images/charges/crossOccitan.svg
diff --git a/charges/crossOrthodox.svg b/public/images/charges/crossOrthodox.svg
similarity index 100%
rename from charges/crossOrthodox.svg
rename to public/images/charges/crossOrthodox.svg
diff --git a/charges/crossPatonce.svg b/public/images/charges/crossPatonce.svg
similarity index 100%
rename from charges/crossPatonce.svg
rename to public/images/charges/crossPatonce.svg
diff --git a/charges/crossPatriarchal.svg b/public/images/charges/crossPatriarchal.svg
similarity index 100%
rename from charges/crossPatriarchal.svg
rename to public/images/charges/crossPatriarchal.svg
diff --git a/charges/crossPattee.svg b/public/images/charges/crossPattee.svg
similarity index 100%
rename from charges/crossPattee.svg
rename to public/images/charges/crossPattee.svg
diff --git a/charges/crossPatteeAlisee.svg b/public/images/charges/crossPatteeAlisee.svg
similarity index 100%
rename from charges/crossPatteeAlisee.svg
rename to public/images/charges/crossPatteeAlisee.svg
diff --git a/charges/crossPommy.svg b/public/images/charges/crossPommy.svg
similarity index 100%
rename from charges/crossPommy.svg
rename to public/images/charges/crossPommy.svg
diff --git a/charges/crossPotent.svg b/public/images/charges/crossPotent.svg
similarity index 100%
rename from charges/crossPotent.svg
rename to public/images/charges/crossPotent.svg
diff --git a/charges/crossSaltire.svg b/public/images/charges/crossSaltire.svg
similarity index 100%
rename from charges/crossSaltire.svg
rename to public/images/charges/crossSaltire.svg
diff --git a/charges/crossSantiago.svg b/public/images/charges/crossSantiago.svg
similarity index 100%
rename from charges/crossSantiago.svg
rename to public/images/charges/crossSantiago.svg
diff --git a/charges/crossTau.svg b/public/images/charges/crossTau.svg
similarity index 100%
rename from charges/crossTau.svg
rename to public/images/charges/crossTau.svg
diff --git a/charges/crossTemplar.svg b/public/images/charges/crossTemplar.svg
similarity index 100%
rename from charges/crossTemplar.svg
rename to public/images/charges/crossTemplar.svg
diff --git a/charges/crossTriquetra.svg b/public/images/charges/crossTriquetra.svg
similarity index 100%
rename from charges/crossTriquetra.svg
rename to public/images/charges/crossTriquetra.svg
diff --git a/charges/crossVoided.svg b/public/images/charges/crossVoided.svg
similarity index 100%
rename from charges/crossVoided.svg
rename to public/images/charges/crossVoided.svg
diff --git a/charges/crosslet.svg b/public/images/charges/crosslet.svg
similarity index 100%
rename from charges/crosslet.svg
rename to public/images/charges/crosslet.svg
diff --git a/charges/crown.svg b/public/images/charges/crown.svg
similarity index 100%
rename from charges/crown.svg
rename to public/images/charges/crown.svg
diff --git a/charges/crown2.svg b/public/images/charges/crown2.svg
similarity index 100%
rename from charges/crown2.svg
rename to public/images/charges/crown2.svg
diff --git a/charges/deerHeadCaboshed.svg b/public/images/charges/deerHeadCaboshed.svg
similarity index 100%
rename from charges/deerHeadCaboshed.svg
rename to public/images/charges/deerHeadCaboshed.svg
diff --git a/charges/delf.svg b/public/images/charges/delf.svg
similarity index 100%
rename from charges/delf.svg
rename to public/images/charges/delf.svg
diff --git a/charges/dolphin.svg b/public/images/charges/dolphin.svg
similarity index 100%
rename from charges/dolphin.svg
rename to public/images/charges/dolphin.svg
diff --git a/charges/dragonPassant.svg b/public/images/charges/dragonPassant.svg
similarity index 100%
rename from charges/dragonPassant.svg
rename to public/images/charges/dragonPassant.svg
diff --git a/charges/dragonRampant.svg b/public/images/charges/dragonRampant.svg
similarity index 100%
rename from charges/dragonRampant.svg
rename to public/images/charges/dragonRampant.svg
diff --git a/charges/eagle.svg b/public/images/charges/eagle.svg
similarity index 100%
rename from charges/eagle.svg
rename to public/images/charges/eagle.svg
diff --git a/charges/eagleTwoHeards.svg b/public/images/charges/eagleTwoHeards.svg
similarity index 100%
rename from charges/eagleTwoHeards.svg
rename to public/images/charges/eagleTwoHeards.svg
diff --git a/charges/elephant.svg b/public/images/charges/elephant.svg
similarity index 100%
rename from charges/elephant.svg
rename to public/images/charges/elephant.svg
diff --git a/charges/escallop.svg b/public/images/charges/escallop.svg
similarity index 100%
rename from charges/escallop.svg
rename to public/images/charges/escallop.svg
diff --git a/charges/estoile.svg b/public/images/charges/estoile.svg
similarity index 100%
rename from charges/estoile.svg
rename to public/images/charges/estoile.svg
diff --git a/charges/falchion.svg b/public/images/charges/falchion.svg
similarity index 100%
rename from charges/falchion.svg
rename to public/images/charges/falchion.svg
diff --git a/charges/fasces.svg b/public/images/charges/fasces.svg
similarity index 100%
rename from charges/fasces.svg
rename to public/images/charges/fasces.svg
diff --git a/charges/fleurDeLis.svg b/public/images/charges/fleurDeLis.svg
similarity index 100%
rename from charges/fleurDeLis.svg
rename to public/images/charges/fleurDeLis.svg
diff --git a/charges/foot.svg b/public/images/charges/foot.svg
similarity index 100%
rename from charges/foot.svg
rename to public/images/charges/foot.svg
diff --git a/charges/fountain.svg b/public/images/charges/fountain.svg
similarity index 100%
rename from charges/fountain.svg
rename to public/images/charges/fountain.svg
diff --git a/charges/fusil.svg b/public/images/charges/fusil.svg
similarity index 100%
rename from charges/fusil.svg
rename to public/images/charges/fusil.svg
diff --git a/charges/garb.svg b/public/images/charges/garb.svg
similarity index 100%
rename from charges/garb.svg
rename to public/images/charges/garb.svg
diff --git a/charges/goat.svg b/public/images/charges/goat.svg
similarity index 100%
rename from charges/goat.svg
rename to public/images/charges/goat.svg
diff --git a/charges/goutte.svg b/public/images/charges/goutte.svg
similarity index 100%
rename from charges/goutte.svg
rename to public/images/charges/goutte.svg
diff --git a/charges/greyhoundCourant.svg b/public/images/charges/greyhoundCourant.svg
similarity index 100%
rename from charges/greyhoundCourant.svg
rename to public/images/charges/greyhoundCourant.svg
diff --git a/charges/greyhoundSejant.svg b/public/images/charges/greyhoundSejant.svg
similarity index 100%
rename from charges/greyhoundSejant.svg
rename to public/images/charges/greyhoundSejant.svg
diff --git a/charges/griffinPassant.svg b/public/images/charges/griffinPassant.svg
similarity index 100%
rename from charges/griffinPassant.svg
rename to public/images/charges/griffinPassant.svg
diff --git a/charges/griffinRampant.svg b/public/images/charges/griffinRampant.svg
similarity index 100%
rename from charges/griffinRampant.svg
rename to public/images/charges/griffinRampant.svg
diff --git a/charges/hand.svg b/public/images/charges/hand.svg
similarity index 100%
rename from charges/hand.svg
rename to public/images/charges/hand.svg
diff --git a/charges/harp.svg b/public/images/charges/harp.svg
similarity index 100%
rename from charges/harp.svg
rename to public/images/charges/harp.svg
diff --git a/charges/hatchet.svg b/public/images/charges/hatchet.svg
similarity index 100%
rename from charges/hatchet.svg
rename to public/images/charges/hatchet.svg
diff --git a/charges/head.svg b/public/images/charges/head.svg
similarity index 100%
rename from charges/head.svg
rename to public/images/charges/head.svg
diff --git a/charges/headWreathed.svg b/public/images/charges/headWreathed.svg
similarity index 100%
rename from charges/headWreathed.svg
rename to public/images/charges/headWreathed.svg
diff --git a/charges/heart.svg b/public/images/charges/heart.svg
similarity index 100%
rename from charges/heart.svg
rename to public/images/charges/heart.svg
diff --git a/charges/helmet.svg b/public/images/charges/helmet.svg
similarity index 100%
rename from charges/helmet.svg
rename to public/images/charges/helmet.svg
diff --git a/charges/heron.svg b/public/images/charges/heron.svg
similarity index 100%
rename from charges/heron.svg
rename to public/images/charges/heron.svg
diff --git a/charges/horsePassant.svg b/public/images/charges/horsePassant.svg
similarity index 100%
rename from charges/horsePassant.svg
rename to public/images/charges/horsePassant.svg
diff --git a/charges/horseRampant.svg b/public/images/charges/horseRampant.svg
similarity index 100%
rename from charges/horseRampant.svg
rename to public/images/charges/horseRampant.svg
diff --git a/charges/horseSalient.svg b/public/images/charges/horseSalient.svg
similarity index 100%
rename from charges/horseSalient.svg
rename to public/images/charges/horseSalient.svg
diff --git a/charges/horseshoe.svg b/public/images/charges/horseshoe.svg
similarity index 100%
rename from charges/horseshoe.svg
rename to public/images/charges/horseshoe.svg
diff --git a/charges/key.svg b/public/images/charges/key.svg
similarity index 100%
rename from charges/key.svg
rename to public/images/charges/key.svg
diff --git a/charges/lamb.svg b/public/images/charges/lamb.svg
similarity index 100%
rename from charges/lamb.svg
rename to public/images/charges/lamb.svg
diff --git a/charges/lambPassantReguardant.svg b/public/images/charges/lambPassantReguardant.svg
similarity index 100%
rename from charges/lambPassantReguardant.svg
rename to public/images/charges/lambPassantReguardant.svg
diff --git a/charges/lionHeadCaboshed.svg b/public/images/charges/lionHeadCaboshed.svg
similarity index 100%
rename from charges/lionHeadCaboshed.svg
rename to public/images/charges/lionHeadCaboshed.svg
diff --git a/charges/lionPassant.svg b/public/images/charges/lionPassant.svg
similarity index 100%
rename from charges/lionPassant.svg
rename to public/images/charges/lionPassant.svg
diff --git a/charges/lionPassantGuardant.svg b/public/images/charges/lionPassantGuardant.svg
similarity index 100%
rename from charges/lionPassantGuardant.svg
rename to public/images/charges/lionPassantGuardant.svg
diff --git a/charges/lionRampant.svg b/public/images/charges/lionRampant.svg
similarity index 100%
rename from charges/lionRampant.svg
rename to public/images/charges/lionRampant.svg
diff --git a/charges/lochaberAxe.svg b/public/images/charges/lochaberAxe.svg
similarity index 100%
rename from charges/lochaberAxe.svg
rename to public/images/charges/lochaberAxe.svg
diff --git a/charges/log.svg b/public/images/charges/log.svg
similarity index 100%
rename from charges/log.svg
rename to public/images/charges/log.svg
diff --git a/charges/lozenge.svg b/public/images/charges/lozenge.svg
similarity index 100%
rename from charges/lozenge.svg
rename to public/images/charges/lozenge.svg
diff --git a/charges/lozengeFaceted.svg b/public/images/charges/lozengeFaceted.svg
similarity index 100%
rename from charges/lozengeFaceted.svg
rename to public/images/charges/lozengeFaceted.svg
diff --git a/charges/lozengePloye.svg b/public/images/charges/lozengePloye.svg
similarity index 100%
rename from charges/lozengePloye.svg
rename to public/images/charges/lozengePloye.svg
diff --git a/charges/lute.svg b/public/images/charges/lute.svg
similarity index 100%
rename from charges/lute.svg
rename to public/images/charges/lute.svg
diff --git a/charges/lymphad.svg b/public/images/charges/lymphad.svg
similarity index 100%
rename from charges/lymphad.svg
rename to public/images/charges/lymphad.svg
diff --git a/charges/mallet.svg b/public/images/charges/mallet.svg
similarity index 100%
rename from charges/mallet.svg
rename to public/images/charges/mallet.svg
diff --git a/charges/mascle.svg b/public/images/charges/mascle.svg
similarity index 100%
rename from charges/mascle.svg
rename to public/images/charges/mascle.svg
diff --git a/charges/mastiffStatant.svg b/public/images/charges/mastiffStatant.svg
similarity index 100%
rename from charges/mastiffStatant.svg
rename to public/images/charges/mastiffStatant.svg
diff --git a/charges/monk.svg b/public/images/charges/monk.svg
similarity index 100%
rename from charges/monk.svg
rename to public/images/charges/monk.svg
diff --git a/charges/mullet.svg b/public/images/charges/mullet.svg
similarity index 100%
rename from charges/mullet.svg
rename to public/images/charges/mullet.svg
diff --git a/charges/mullet10.svg b/public/images/charges/mullet10.svg
similarity index 100%
rename from charges/mullet10.svg
rename to public/images/charges/mullet10.svg
diff --git a/charges/mullet4.svg b/public/images/charges/mullet4.svg
similarity index 100%
rename from charges/mullet4.svg
rename to public/images/charges/mullet4.svg
diff --git a/charges/mullet6.svg b/public/images/charges/mullet6.svg
similarity index 100%
rename from charges/mullet6.svg
rename to public/images/charges/mullet6.svg
diff --git a/charges/mullet6Faceted.svg b/public/images/charges/mullet6Faceted.svg
similarity index 100%
rename from charges/mullet6Faceted.svg
rename to public/images/charges/mullet6Faceted.svg
diff --git a/charges/mullet6Pierced.svg b/public/images/charges/mullet6Pierced.svg
similarity index 100%
rename from charges/mullet6Pierced.svg
rename to public/images/charges/mullet6Pierced.svg
diff --git a/charges/mullet7.svg b/public/images/charges/mullet7.svg
similarity index 100%
rename from charges/mullet7.svg
rename to public/images/charges/mullet7.svg
diff --git a/charges/mullet8.svg b/public/images/charges/mullet8.svg
similarity index 100%
rename from charges/mullet8.svg
rename to public/images/charges/mullet8.svg
diff --git a/charges/mulletFaceted.svg b/public/images/charges/mulletFaceted.svg
similarity index 100%
rename from charges/mulletFaceted.svg
rename to public/images/charges/mulletFaceted.svg
diff --git a/charges/mulletPierced.svg b/public/images/charges/mulletPierced.svg
similarity index 100%
rename from charges/mulletPierced.svg
rename to public/images/charges/mulletPierced.svg
diff --git a/charges/oak.svg b/public/images/charges/oak.svg
similarity index 100%
rename from charges/oak.svg
rename to public/images/charges/oak.svg
diff --git a/charges/orb.svg b/public/images/charges/orb.svg
similarity index 100%
rename from charges/orb.svg
rename to public/images/charges/orb.svg
diff --git a/charges/owl.svg b/public/images/charges/owl.svg
similarity index 100%
rename from charges/owl.svg
rename to public/images/charges/owl.svg
diff --git a/charges/parrot.svg b/public/images/charges/parrot.svg
similarity index 100%
rename from charges/parrot.svg
rename to public/images/charges/parrot.svg
diff --git a/charges/pegasus.svg b/public/images/charges/pegasus.svg
similarity index 100%
rename from charges/pegasus.svg
rename to public/images/charges/pegasus.svg
diff --git a/charges/pike.svg b/public/images/charges/pike.svg
similarity index 100%
rename from charges/pike.svg
rename to public/images/charges/pike.svg
diff --git a/charges/pique.svg b/public/images/charges/pique.svg
similarity index 100%
rename from charges/pique.svg
rename to public/images/charges/pique.svg
diff --git a/charges/plough.svg b/public/images/charges/plough.svg
similarity index 100%
rename from charges/plough.svg
rename to public/images/charges/plough.svg
diff --git a/charges/porcupine.svg b/public/images/charges/porcupine.svg
similarity index 100%
rename from charges/porcupine.svg
rename to public/images/charges/porcupine.svg
diff --git a/charges/pot.svg b/public/images/charges/pot.svg
similarity index 100%
rename from charges/pot.svg
rename to public/images/charges/pot.svg
diff --git a/charges/rake.svg b/public/images/charges/rake.svg
similarity index 100%
rename from charges/rake.svg
rename to public/images/charges/rake.svg
diff --git a/charges/ramsHorn.svg b/public/images/charges/ramsHorn.svg
similarity index 100%
rename from charges/ramsHorn.svg
rename to public/images/charges/ramsHorn.svg
diff --git a/charges/raven.svg b/public/images/charges/raven.svg
similarity index 100%
rename from charges/raven.svg
rename to public/images/charges/raven.svg
diff --git a/charges/rose.svg b/public/images/charges/rose.svg
similarity index 100%
rename from charges/rose.svg
rename to public/images/charges/rose.svg
diff --git a/charges/roundel.svg b/public/images/charges/roundel.svg
similarity index 100%
rename from charges/roundel.svg
rename to public/images/charges/roundel.svg
diff --git a/charges/roundel2.svg b/public/images/charges/roundel2.svg
similarity index 100%
rename from charges/roundel2.svg
rename to public/images/charges/roundel2.svg
diff --git a/charges/rustre.svg b/public/images/charges/rustre.svg
similarity index 100%
rename from charges/rustre.svg
rename to public/images/charges/rustre.svg
diff --git a/charges/sabre.svg b/public/images/charges/sabre.svg
similarity index 100%
rename from charges/sabre.svg
rename to public/images/charges/sabre.svg
diff --git a/charges/sabre2.svg b/public/images/charges/sabre2.svg
similarity index 100%
rename from charges/sabre2.svg
rename to public/images/charges/sabre2.svg
diff --git a/charges/sabresCrossed.svg b/public/images/charges/sabresCrossed.svg
similarity index 100%
rename from charges/sabresCrossed.svg
rename to public/images/charges/sabresCrossed.svg
diff --git a/charges/serpent.svg b/public/images/charges/serpent.svg
similarity index 100%
rename from charges/serpent.svg
rename to public/images/charges/serpent.svg
diff --git a/charges/snake.svg b/public/images/charges/snake.svg
similarity index 100%
rename from charges/snake.svg
rename to public/images/charges/snake.svg
diff --git a/charges/stagsAttires.svg b/public/images/charges/stagsAttires.svg
similarity index 100%
rename from charges/stagsAttires.svg
rename to public/images/charges/stagsAttires.svg
diff --git a/charges/sun.svg b/public/images/charges/sun.svg
similarity index 100%
rename from charges/sun.svg
rename to public/images/charges/sun.svg
diff --git a/charges/sunInSplendour.svg b/public/images/charges/sunInSplendour.svg
similarity index 100%
rename from charges/sunInSplendour.svg
rename to public/images/charges/sunInSplendour.svg
diff --git a/charges/swan.svg b/public/images/charges/swan.svg
similarity index 100%
rename from charges/swan.svg
rename to public/images/charges/swan.svg
diff --git a/charges/swanErased.svg b/public/images/charges/swanErased.svg
similarity index 100%
rename from charges/swanErased.svg
rename to public/images/charges/swanErased.svg
diff --git a/charges/sword.svg b/public/images/charges/sword.svg
similarity index 100%
rename from charges/sword.svg
rename to public/images/charges/sword.svg
diff --git a/charges/template.svg b/public/images/charges/template.svg
similarity index 100%
rename from charges/template.svg
rename to public/images/charges/template.svg
diff --git a/charges/tower.svg b/public/images/charges/tower.svg
similarity index 100%
rename from charges/tower.svg
rename to public/images/charges/tower.svg
diff --git a/charges/tree.svg b/public/images/charges/tree.svg
similarity index 100%
rename from charges/tree.svg
rename to public/images/charges/tree.svg
diff --git a/charges/trefle.svg b/public/images/charges/trefle.svg
similarity index 100%
rename from charges/trefle.svg
rename to public/images/charges/trefle.svg
diff --git a/charges/triangle.svg b/public/images/charges/triangle.svg
similarity index 100%
rename from charges/triangle.svg
rename to public/images/charges/triangle.svg
diff --git a/charges/trianglePierced.svg b/public/images/charges/trianglePierced.svg
similarity index 100%
rename from charges/trianglePierced.svg
rename to public/images/charges/trianglePierced.svg
diff --git a/charges/unicornRampant.svg b/public/images/charges/unicornRampant.svg
similarity index 100%
rename from charges/unicornRampant.svg
rename to public/images/charges/unicornRampant.svg
diff --git a/charges/wheel.svg b/public/images/charges/wheel.svg
similarity index 100%
rename from charges/wheel.svg
rename to public/images/charges/wheel.svg
diff --git a/charges/wing.svg b/public/images/charges/wing.svg
similarity index 100%
rename from charges/wing.svg
rename to public/images/charges/wing.svg
diff --git a/charges/wingSword.svg b/public/images/charges/wingSword.svg
similarity index 100%
rename from charges/wingSword.svg
rename to public/images/charges/wingSword.svg
diff --git a/charges/wolfHeadErased.svg b/public/images/charges/wolfHeadErased.svg
similarity index 100%
rename from charges/wolfHeadErased.svg
rename to public/images/charges/wolfHeadErased.svg
diff --git a/charges/wolfPassant.svg b/public/images/charges/wolfPassant.svg
similarity index 100%
rename from charges/wolfPassant.svg
rename to public/images/charges/wolfPassant.svg
diff --git a/charges/wolfRampant.svg b/public/images/charges/wolfRampant.svg
similarity index 100%
rename from charges/wolfRampant.svg
rename to public/images/charges/wolfRampant.svg
diff --git a/charges/wolfStatant.svg b/public/images/charges/wolfStatant.svg
similarity index 100%
rename from charges/wolfStatant.svg
rename to public/images/charges/wolfStatant.svg
diff --git a/charges/wyvern.svg b/public/images/charges/wyvern.svg
similarity index 100%
rename from charges/wyvern.svg
rename to public/images/charges/wyvern.svg
diff --git a/charges/wyvernWithWingsDisplayed.svg b/public/images/charges/wyvernWithWingsDisplayed.svg
similarity index 100%
rename from charges/wyvernWithWingsDisplayed.svg
rename to public/images/charges/wyvernWithWingsDisplayed.svg
diff --git a/images/kiwiroo.png b/public/images/oceanPatterns/kiwiroo.png
similarity index 100%
rename from images/kiwiroo.png
rename to public/images/oceanPatterns/kiwiroo.png
diff --git a/images/pattern1.png b/public/images/oceanPatterns/pattern1.png
similarity index 100%
rename from images/pattern1.png
rename to public/images/oceanPatterns/pattern1.png
diff --git a/images/pattern2.png b/public/images/oceanPatterns/pattern2.png
similarity index 100%
rename from images/pattern2.png
rename to public/images/oceanPatterns/pattern2.png
diff --git a/images/pattern3.png b/public/images/oceanPatterns/pattern3.png
similarity index 100%
rename from images/pattern3.png
rename to public/images/oceanPatterns/pattern3.png
diff --git a/images/pattern4.png b/public/images/oceanPatterns/pattern4.png
similarity index 100%
rename from images/pattern4.png
rename to public/images/oceanPatterns/pattern4.png
diff --git a/images/pattern5.png b/public/images/oceanPatterns/pattern5.png
similarity index 100%
rename from images/pattern5.png
rename to public/images/oceanPatterns/pattern5.png
diff --git a/images/pattern6.png b/public/images/oceanPatterns/pattern6.png
similarity index 100%
rename from images/pattern6.png
rename to public/images/oceanPatterns/pattern6.png
diff --git a/heightmaps/africa-centric.png b/src/assets/heightmaps/africa-centric.png
similarity index 100%
rename from heightmaps/africa-centric.png
rename to src/assets/heightmaps/africa-centric.png
diff --git a/heightmaps/arabia.png b/src/assets/heightmaps/arabia.png
similarity index 100%
rename from heightmaps/arabia.png
rename to src/assets/heightmaps/arabia.png
diff --git a/heightmaps/atlantics.png b/src/assets/heightmaps/atlantics.png
similarity index 100%
rename from heightmaps/atlantics.png
rename to src/assets/heightmaps/atlantics.png
diff --git a/heightmaps/britain.png b/src/assets/heightmaps/britain.png
similarity index 100%
rename from heightmaps/britain.png
rename to src/assets/heightmaps/britain.png
diff --git a/heightmaps/caribbean.png b/src/assets/heightmaps/caribbean.png
similarity index 100%
rename from heightmaps/caribbean.png
rename to src/assets/heightmaps/caribbean.png
diff --git a/heightmaps/east-asia.png b/src/assets/heightmaps/east-asia.png
similarity index 100%
rename from heightmaps/east-asia.png
rename to src/assets/heightmaps/east-asia.png
diff --git a/heightmaps/eurasia.png b/src/assets/heightmaps/eurasia.png
similarity index 100%
rename from heightmaps/eurasia.png
rename to src/assets/heightmaps/eurasia.png
diff --git a/heightmaps/europe-accented.png b/src/assets/heightmaps/europe-accented.png
similarity index 100%
rename from heightmaps/europe-accented.png
rename to src/assets/heightmaps/europe-accented.png
diff --git a/heightmaps/europe-and-central-asia.png b/src/assets/heightmaps/europe-and-central-asia.png
similarity index 100%
rename from heightmaps/europe-and-central-asia.png
rename to src/assets/heightmaps/europe-and-central-asia.png
diff --git a/heightmaps/europe-central.png b/src/assets/heightmaps/europe-central.png
similarity index 100%
rename from heightmaps/europe-central.png
rename to src/assets/heightmaps/europe-central.png
diff --git a/heightmaps/europe-north.png b/src/assets/heightmaps/europe-north.png
similarity index 100%
rename from heightmaps/europe-north.png
rename to src/assets/heightmaps/europe-north.png
diff --git a/heightmaps/europe.png b/src/assets/heightmaps/europe.png
similarity index 100%
rename from heightmaps/europe.png
rename to src/assets/heightmaps/europe.png
diff --git a/heightmaps/greenland.png b/src/assets/heightmaps/greenland.png
similarity index 100%
rename from heightmaps/greenland.png
rename to src/assets/heightmaps/greenland.png
diff --git a/heightmaps/hellenica.png b/src/assets/heightmaps/hellenica.png
similarity index 100%
rename from heightmaps/hellenica.png
rename to src/assets/heightmaps/hellenica.png
diff --git a/heightmaps/iceland.png b/src/assets/heightmaps/iceland.png
similarity index 100%
rename from heightmaps/iceland.png
rename to src/assets/heightmaps/iceland.png
diff --git a/heightmaps/import-rules.txt b/src/assets/heightmaps/import-rules.txt
similarity index 100%
rename from heightmaps/import-rules.txt
rename to src/assets/heightmaps/import-rules.txt
diff --git a/heightmaps/indian-ocean.png b/src/assets/heightmaps/indian-ocean.png
similarity index 100%
rename from heightmaps/indian-ocean.png
rename to src/assets/heightmaps/indian-ocean.png
diff --git a/heightmaps/mediterranean-sea.png b/src/assets/heightmaps/mediterranean-sea.png
similarity index 100%
rename from heightmaps/mediterranean-sea.png
rename to src/assets/heightmaps/mediterranean-sea.png
diff --git a/heightmaps/middle-east.png b/src/assets/heightmaps/middle-east.png
similarity index 100%
rename from heightmaps/middle-east.png
rename to src/assets/heightmaps/middle-east.png
diff --git a/heightmaps/north-america.png b/src/assets/heightmaps/north-america.png
similarity index 100%
rename from heightmaps/north-america.png
rename to src/assets/heightmaps/north-america.png
diff --git a/heightmaps/us-centric.png b/src/assets/heightmaps/us-centric.png
similarity index 100%
rename from heightmaps/us-centric.png
rename to src/assets/heightmaps/us-centric.png
diff --git a/heightmaps/us-mainland.png b/src/assets/heightmaps/us-mainland.png
similarity index 100%
rename from heightmaps/us-mainland.png
rename to src/assets/heightmaps/us-mainland.png
diff --git a/heightmaps/world-from-pacific.png b/src/assets/heightmaps/world-from-pacific.png
similarity index 100%
rename from heightmaps/world-from-pacific.png
rename to src/assets/heightmaps/world-from-pacific.png
diff --git a/heightmaps/world.png b/src/assets/heightmaps/world.png
similarity index 100%
rename from heightmaps/world.png
rename to src/assets/heightmaps/world.png
diff --git a/src/assets/styles/ancient.json b/src/assets/styles/ancient.json
index 09704553..ffc3e775 100644
--- a/src/assets/styles/ancient.json
+++ b/src/assets/styles/ancient.json
@@ -284,7 +284,7 @@
"fill": "#c99f64"
},
"#oceanicPattern": {
- "href": "./images/kiwiroo.png",
+ "href": "./images/oceanPatterns/kiwiroo.png",
"opacity": 0.4
},
"#terrs": {
diff --git a/src/assets/styles/default.json b/src/assets/styles/default.json
index eb4acb69..37a52b33 100644
--- a/src/assets/styles/default.json
+++ b/src/assets/styles/default.json
@@ -280,7 +280,7 @@
"fill": "#466eab"
},
"#oceanicPattern": {
- "href": "./images/pattern1.png",
+ "href": "./images/oceanPatterns/pattern1.png",
"opacity": 0.2
},
"#terrs": {
diff --git a/src/assets/styles/gloom.json b/src/assets/styles/gloom.json
index 91b5e0fe..95dee382 100644
--- a/src/assets/styles/gloom.json
+++ b/src/assets/styles/gloom.json
@@ -286,7 +286,7 @@
"fill": "#4e6964"
},
"#oceanicPattern": {
- "href": "./images/pattern3.png",
+ "href": "./images/oceanPatterns/pattern3.png",
"opacity": 0.2
},
"#terrs": {
diff --git a/src/assets/styles/light.json b/src/assets/styles/light.json
index 5663d6c8..6a225e86 100644
--- a/src/assets/styles/light.json
+++ b/src/assets/styles/light.json
@@ -280,7 +280,7 @@
"fill": "#8dc1c8"
},
"#oceanicPattern": {
- "href": "./images/pattern1.png",
+ "href": "./images/oceanPatterns/pattern1.png",
"opacity": 0.2
},
"#terrs": {
diff --git a/src/assets/styles/watercolor.json b/src/assets/styles/watercolor.json
index 729df648..99908126 100644
--- a/src/assets/styles/watercolor.json
+++ b/src/assets/styles/watercolor.json
@@ -280,7 +280,7 @@
"fill": "#2d788b"
},
"#oceanicPattern": {
- "href": "./images/kiwiroo.png",
+ "href": "./images/oceanPatterns/kiwiroo.png",
"opacity": 0.5
},
"#terrs": {
diff --git a/src/modules/coa-renderer.js b/src/modules/coa-renderer.js
index 58c0848c..8c7e370b 100644
--- a/src/modules/coa-renderer.js
+++ b/src/modules/coa-renderer.js
@@ -1,4 +1,4 @@
-"use strict";
+import {ERROR} from "config/logging";
window.COArenderer = (function () {
const colors = {
@@ -1945,9 +1945,8 @@ window.COArenderer = (function () {
return fetchedCharges.join("");
}
- const url = location.hostname ? "./charges/" : "http://armoria.herokuapp.com/charges/"; // on local machine fetch files from server
async function fetchCharge(charge, id) {
- const fetched = fetch(url + charge + ".svg")
+ const fetched = fetch(`./images/charges/${charge}.svg`)
.then(res => {
if (res.ok) return res.text();
else throw new Error("Cannot fetch charge");
diff --git a/src/modules/heightmap-generator.js b/src/modules/heightmap-generator.js
index eafccdf6..ec2235c2 100644
--- a/src/modules/heightmap-generator.js
+++ b/src/modules/heightmap-generator.js
@@ -58,7 +58,7 @@ window.HeightmapGenerator = (function () {
// load heightmap into image and render to canvas
const img = new Image();
- img.src = `./heightmaps/${id}.png`;
+ img.src = `../assets/heightmaps/${id}.png`;
img.onload = () => {
ctx.drawImage(img, 0, 0, cellsX, cellsY);
const imageData = ctx.getImageData(0, 0, cellsX, cellsY);
diff --git a/vite.config.js b/vite.config.js
index 4c48cf91..5bcad631 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -34,7 +34,6 @@ export default defineConfig(({mode}) => {
if (id.includes("node_modules")) {
return "vendor";
}
-
const importersLen = getModuleInfo(id).importers.length;
if (importersLen > 1) {
return "common";