[master] Add category/practice tables + refactor