Merge pull request #6 from Stedwell/master

Shuffling files around.