Change package structure

Fixes #43.
Uses the new proposed package structure.