Table moved to dedicated file
Moved Table class to dedicated file
Merge branch 'refactor'