Merge pull request #259 from bjanish/sandbox

Bug fix
Moved files around