Moved and renamed files; changed paths.

Closes #3.
Merge branch 'fix-issue-3'