Merge pull request #19 from eric-wu/master

Renaming, moving, more logging, fixing unit tests.