Restructured Vanilla classes, added roles to db