Refactored folder and package names.
Merge pull request #1 from nathanshih/refactor

Refactored folder and package names.