Re-construct project, remove dbcp supported. Make data-source singleton.