Change to filename extraction

Fixes #10
Allowing fonts and textures to be added raw

Fixes #11