- added JPA annotations to POJO classes - merged JPA Repos with Hibernate repos so we only use JPA - renamed .txt files to .sql - moved Spring configuration files so it is easier to use them inside JUnit tests