Better file/folder structure
Merging in older typography