ADDED: Basic data structure in SQL and tables
FIXED: Some class names didn't get converted previously