Change directory structure to be more idiomatic.
Merge pull request #58 from metajack/cargoify

Change directory structure to be more idiomatic.