Created base classes, refactored to them.
Added data container to folders.
Merge pull request #232 from xi-project/harmonize-identifiables

Harmonize identifiables