Change naming convention to be true camelcase, start to rearrange db driver