Moved files, fixed from pull request #3.