Restructure package hierarchy
Merge pull request #1 from 1169306/master

Restructure package hierarchy