Update database initialization and move models