Half-baked v0.3
Reorganizing part 1
Reorg part 2
Merge pull request #2 from dnath/v0.3

V0.3