DB + Service Code Refactoring

code moved