Refactored code. Added Connection pool. Added namespaces to properties files