Merged DB config into one file
Refactored with Spring Data