Restructure and test
Merge pull request #34 from planetlabs/structure

Restructure and test.