Refactored package structure in main project
Merge pull request #21 from matthieuHanne/RefactoringBehaviours

Refactored package structure in main project
merged
merged with master