Move code to named package
Merge pull request #148 from mpeltonen/topic/named_package

Move code to named package