Refactoring to separate data from structure
Merge pull request #1 from Aspart/feature

Refactoring to separate data from structure