arrange files in packages
.
Merge pull request #1 from avishayMahluf/master

changes in forked repo