move things around a bit, extract database settings to a seperate file