Restructure - DSVC-162 - fixed db.properties and log4j