Java HIbernate project Fixes

Project Goal: Deprecate hibernate *.hbm file and queries and use Annotation based config. I have 4 class that map to tables through xml config. Need to remove the xml config and use Annotation. I have already done many class in the project. You just need to do the rest and follow example in the one i already completed. Some classes have many queries but it is just a matter of cutting and pasting mapping to @nameQueries.... Looking to get this done in 1-3 days. Not a huge task. Project should build properly once you are done. Maven Project. Mysql Tomcat Java 8 required to run and deploy.