- structure refactoring
Merge pull request #2 from afabiani/master

 - structure refactoring