Cleanup file tree

Hi Brian,

I did a little cleanup on your repo as described in the commits.

Cheers, Enrico