Composer cleanup
Simpler file layout
Merge pull request #30 from GrahamCampbell/patch-1

Composer cleanup