Move database section, modify server-side section