Put src before type

Closes #14