Beginning of real DB tables, more organized structure