Cleanup code, moved Query Builder
Initial DB Helper
Fixed demo config