adding new table strcuture, removed unused tables