move toolkit & dblog, fix dataserver include order