Change package layout

Tackle all issues from #74.