Improved project structure and Hibernate ManyToMany with additional column mapping.