! move some files around
Merge pull request #25 from Spuds/master

Move some files around