Refactoring SQLite database, adding tables