major refactoring
Merge pull request #6 from nadavmatalon/newStructure

major refactoring