refactor configuration to prepare for orm. fix #105