restructures packages a bit
Merge pull request #41 from dvicini/master

restructures packages a bit