New files to reflect OO structure for hibernate conversion