Convertion to JPA

Project converted to JPA Project