Full Restructure and Initial Hibernate Entity