Moved files around
Moved files around
Merge pull request #260 from bjanish/master

Moved around files