Removed and renamed some files, and moved methods around to appropriate locations.
Merge pull request #7 from joshludwig/master

Removed and renamed some files, and moved methods around to appropriate locations.