restructure packages and content
Merge pull request #30 from ridoo/master

restructure packages and content