Merge pull request #2 from wilbertom/master

Migrate some more files