Normalize database schema & refactor java class and dao class