diff --git a/README.md b/README.md
index e5f764b..639550f 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,15 @@
# Puff Emojis
-![Awesome](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/puff_awesome.png)
-![Bold](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/puff_bold.png)
-![Happy](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/puff_happy.png)
-![Hurrr](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/puff_hurrr.png)
-![Love](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/puff_love.png)
-![Mild Panic](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/puff_mild_panic.png)
-![Sad](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/puff_sad.png)
-![Scream](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/puff_scream.png)
-![Silly](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/puff_silly.png)
-![Thinking](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/puff_thinking.png)
-![Warm](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/puff_warm.png)
-![Wink](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/puff_wink.png)
-![Yay](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/puff_yay.png)
\ No newline at end of file
+![Awesome](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/png/puff_awesome.png)
+![Bold](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/png/puff_bold.png)
+![Happy](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/png/puff_happy.png)
+![Hurrr](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/png/puff_hurrr.png)
+![Love](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/png/puff_love.png)
+![Mild Panic](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/png/puff_mild_panic.png)
+![Sad](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/png/puff_sad.png)
+![Scream](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/png/puff_scream.png)
+![Silly](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/png/puff_silly.png)
+![Thinking](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/png/puff_thinking.png)
+![Warm](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/png/puff_warm.png)
+![Wink](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/png/puff_wink.png)
+![Yay](https://git.thj.no/thor/emoji-puff/raw/branch/master/images/png/puff_yay.png)
diff --git a/images/puff_awesome.png b/images/png/puff_awesome.png
similarity index 100%
rename from images/puff_awesome.png
rename to images/png/puff_awesome.png
diff --git a/images/puff_bold.png b/images/png/puff_bold.png
similarity index 100%
rename from images/puff_bold.png
rename to images/png/puff_bold.png
diff --git a/images/puff_happy.png b/images/png/puff_happy.png
similarity index 100%
rename from images/puff_happy.png
rename to images/png/puff_happy.png
diff --git a/images/puff_hurrr.png b/images/png/puff_hurrr.png
similarity index 100%
rename from images/puff_hurrr.png
rename to images/png/puff_hurrr.png
diff --git a/images/puff_love.png b/images/png/puff_love.png
similarity index 100%
rename from images/puff_love.png
rename to images/png/puff_love.png
diff --git a/images/puff_mild_panic.png b/images/png/puff_mild_panic.png
similarity index 100%
rename from images/puff_mild_panic.png
rename to images/png/puff_mild_panic.png
diff --git a/images/puff_sad.png b/images/png/puff_sad.png
similarity index 100%
rename from images/puff_sad.png
rename to images/png/puff_sad.png
diff --git a/images/puff_scream.png b/images/png/puff_scream.png
similarity index 100%
rename from images/puff_scream.png
rename to images/png/puff_scream.png
diff --git a/images/puff_silly.png b/images/png/puff_silly.png
similarity index 100%
rename from images/puff_silly.png
rename to images/png/puff_silly.png
diff --git a/images/puff_thinking.png b/images/png/puff_thinking.png
similarity index 100%
rename from images/puff_thinking.png
rename to images/png/puff_thinking.png
diff --git a/images/puff_warm.png b/images/png/puff_warm.png
similarity index 100%
rename from images/puff_warm.png
rename to images/png/puff_warm.png
diff --git a/images/puff_wink.png b/images/png/puff_wink.png
similarity index 100%
rename from images/puff_wink.png
rename to images/png/puff_wink.png
diff --git a/images/puff_yay.png b/images/png/puff_yay.png
similarity index 100%
rename from images/puff_yay.png
rename to images/png/puff_yay.png
diff --git a/images/svg/puff_awesome.svg b/images/svg/puff_awesome.svg
new file mode 100644
index 0000000..df1864a
--- /dev/null
+++ b/images/svg/puff_awesome.svg
@@ -0,0 +1,101 @@
+
+
+
diff --git a/images/svg/puff_bold.svg b/images/svg/puff_bold.svg
new file mode 100644
index 0000000..87b7b42
--- /dev/null
+++ b/images/svg/puff_bold.svg
@@ -0,0 +1,80 @@
+
+
+
diff --git a/images/svg/puff_happy.svg b/images/svg/puff_happy.svg
new file mode 100644
index 0000000..0edb14b
--- /dev/null
+++ b/images/svg/puff_happy.svg
@@ -0,0 +1,73 @@
+
+
+
diff --git a/images/svg/puff_hurrr.svg b/images/svg/puff_hurrr.svg
new file mode 100644
index 0000000..6e47f76
--- /dev/null
+++ b/images/svg/puff_hurrr.svg
@@ -0,0 +1,91 @@
+
+
+
diff --git a/images/svg/puff_love.svg b/images/svg/puff_love.svg
new file mode 100644
index 0000000..82865c5
--- /dev/null
+++ b/images/svg/puff_love.svg
@@ -0,0 +1,59 @@
+
+
+
diff --git a/images/svg/puff_mild_panic.svg b/images/svg/puff_mild_panic.svg
new file mode 100644
index 0000000..66f01a1
--- /dev/null
+++ b/images/svg/puff_mild_panic.svg
@@ -0,0 +1,85 @@
+
+
+
diff --git a/images/svg/puff_sad.svg b/images/svg/puff_sad.svg
new file mode 100644
index 0000000..30f9a0e
--- /dev/null
+++ b/images/svg/puff_sad.svg
@@ -0,0 +1,85 @@
+
+
+
diff --git a/images/svg/puff_scream.svg b/images/svg/puff_scream.svg
new file mode 100644
index 0000000..64e21fd
--- /dev/null
+++ b/images/svg/puff_scream.svg
@@ -0,0 +1,145 @@
+
+
+
diff --git a/images/svg/puff_silly.svg b/images/svg/puff_silly.svg
new file mode 100644
index 0000000..039f98f
--- /dev/null
+++ b/images/svg/puff_silly.svg
@@ -0,0 +1,85 @@
+
+
+
diff --git a/images/svg/puff_thinking.svg b/images/svg/puff_thinking.svg
new file mode 100644
index 0000000..15a817f
--- /dev/null
+++ b/images/svg/puff_thinking.svg
@@ -0,0 +1,89 @@
+
+
+
diff --git a/images/svg/puff_warm.svg b/images/svg/puff_warm.svg
new file mode 100644
index 0000000..93db739
--- /dev/null
+++ b/images/svg/puff_warm.svg
@@ -0,0 +1,51 @@
+
+
+
diff --git a/images/svg/puff_wink.svg b/images/svg/puff_wink.svg
new file mode 100644
index 0000000..2da1103
--- /dev/null
+++ b/images/svg/puff_wink.svg
@@ -0,0 +1,79 @@
+
+
+
diff --git a/images/svg/puff_yay.svg b/images/svg/puff_yay.svg
new file mode 100644
index 0000000..09d6a6c
--- /dev/null
+++ b/images/svg/puff_yay.svg
@@ -0,0 +1,67 @@
+
+
+
diff --git a/release.tar b/release/puff.tar
similarity index 100%
rename from release.tar
rename to release/puff.tar
diff --git a/release.tar.bz2 b/release/puff.tar.bz2
similarity index 100%
rename from release.tar.bz2
rename to release/puff.tar.bz2
diff --git a/release.tar.gz b/release/puff.tar.gz
similarity index 100%
rename from release.tar.gz
rename to release/puff.tar.gz
diff --git a/release.zip b/release/puff.zip
similarity index 100%
rename from release.zip
rename to release/puff.zip
diff --git a/puff.afdesign b/src/master.afdesign
similarity index 100%
rename from puff.afdesign
rename to src/master.afdesign
diff --git a/puff.svg b/src/master_exported.svg
similarity index 100%
rename from puff.svg
rename to src/master_exported.svg