Moved test classes to subfolders. Added DataTable class including test files.
Merge origin/master