diff --git a/.gitignore b/.gitignore
index c10326ca..762505ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
-env/*
\ No newline at end of file
+env/*
+sources/instances/postscript/*.designspace
\ No newline at end of file
diff --git a/sources/CFF.yaml b/sources/CFF.yaml
new file mode 100644
index 00000000..d98e6ece
--- /dev/null
+++ b/sources/CFF.yaml
@@ -0,0 +1,15 @@
+familyName: "Intel One Mono"
+sources:
+    - instances/postscript/IntelOneMono-Bold.ufo 
+    - instances/postscript/IntelOneMono-BoldItalic.ufo 
+    - instances/postscript/IntelOneMono-Italic.ufo 
+    - instances/postscript/IntelOneMono-Light.ufo 
+    - instances/postscript/IntelOneMono-LightItalic.ufo 
+    - instances/postscript/IntelOneMono-Medium.ufo 
+    - instances/postscript/IntelOneMono-MediumItalic.ufo 
+    - instances/postscript/IntelOneMono-Regular.ufo
+buildVariable: false
+buildTTF: false
+buildWebfont: false
+logLevel: WARNING
+checkCompatibility: false
diff --git a/sources/TTF.yaml b/sources/TTF.yaml
new file mode 100644
index 00000000..5d68d15d
--- /dev/null
+++ b/sources/TTF.yaml
@@ -0,0 +1,27 @@
+familyName: "Intel One Mono"
+sources:
+    - instances/truetype/IntelOneMono-Bold.ufo 
+    - instances/truetype/IntelOneMono-BoldItalic.ufo 
+    - instances/truetype/IntelOneMono-Italic.ufo 
+    - instances/truetype/IntelOneMono-Light.ufo 
+    - instances/truetype/IntelOneMono-LightItalic.ufo 
+    - instances/truetype/IntelOneMono-Medium.ufo 
+    - instances/truetype/IntelOneMono-MediumItalic.ufo 
+    - instances/truetype/IntelOneMono-Regular.ufo
+buildVariable: false
+buildOTF: false 
+woffDir: ../fonts/woff2
+logLevel: WARNING
+removeOutlineOverlaps: false
+reverseOutlineDirection: false
+checkCompatibility: false
+autohintTTF: false
+vttSources:
+  IntelOneMono-Light.ttf: other files/truetype hinting ttx/IntelOneMono-Light-vtt.ttx
+  IntelOneMono-LightItalic.ttf: other files/truetype hinting ttx/IntelOneMono-LightItalic-vtt.ttx
+  IntelOneMono-Regular.ttf: other files/truetype hinting ttx/IntelOneMono-Regular-vtt.ttx
+  IntelOneMono-Italic.ttf: other files/truetype hinting ttx/IntelOneMono-Italic-vtt.ttx
+  IntelOneMono-Medium.ttf: other files/truetype hinting ttx/IntelOneMono-Medium-vtt.ttx
+  IntelOneMono-MediumItalic.ttf: other files/truetype hinting ttx/IntelOneMono-MediumItalic-vtt.ttx
+  IntelOneMono-Bold.ttf: other files/truetype hinting ttx/IntelOneMono-Bold-vtt.ttx
+  IntelOneMono-BoldItalic.ttf: other files/truetype hinting ttx/IntelOneMono-BoldItalic-vtt.ttx
diff --git a/sources/config.yaml b/sources/config.yaml
deleted file mode 100644
index 103d4ea0..00000000
--- a/sources/config.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-familyName: "Intel One Mono"
-sources:
-    - instances/truetype/IntelOneMono-Bold.ufo 
-    - instances/truetype/IntelOneMono-BoldItalic.ufo 
-    - instances/truetype/IntelOneMono-Italic.ufo 
-    - instances/truetype/IntelOneMono-Light.ufo 
-    - instances/truetype/IntelOneMono-LightItalic.ufo 
-    - instances/truetype/IntelOneMono-Medium.ufo 
-    - instances/truetype/IntelOneMono-MediumItalic.ufo 
-    - instances/truetype/IntelOneMono-Regular.ufo
-buildVariable: false
-buildOTF: false
-woffDir: ../fonts/woff2
-logLevel: WARNING
-removeOutlineOverlaps: false
-reverseOutlineDirection: false
-checkCompatibility: false
-autohintTTF: false
-vttSources:
-  IntelOneMono-Light.ttf: tt-hinting/vtt-hinting-ttx/IntelOneMono-Light-vtt.ttx
-  IntelOneMono-LightItalic.ttf: tt-hinting/vtt-hinting-ttx/IntelOneMono-LightItalic-vtt.ttx
-  IntelOneMono-Regular.ttf: tt-hinting/vtt-hinting-ttx/IntelOneMono-Regular-vtt.ttx
-  IntelOneMono-Italic.ttf: tt-hinting/vtt-hinting-ttx/IntelOneMono-Italic-vtt.ttx
-  IntelOneMono-Medium.ttf: tt-hinting/vtt-hinting-ttx/IntelOneMono-Medium-vtt.ttx
-  IntelOneMono-MediumItalic.ttf: tt-hinting/vtt-hinting-ttx/IntelOneMono-MediumItalic-vtt.ttx
-  IntelOneMono-Bold.ttf: tt-hinting/vtt-hinting-ttx/IntelOneMono-Bold-vtt.ttx
-  IntelOneMono-BoldItalic.ttf: tt-hinting/vtt-hinting-ttx/IntelOneMono-BoldItalic-vtt.ttx