updated database structure
shortened class names