Refactoring of code organization and better data encapsulation
Merge pull request #5 from Enlightment/master

Refactoring of code organization and better data encapsulation