Merge pull request #1468 from dstufft/move-to-src

Move the cryptography package into a src/ subdirectory