Prepare JPA integration - Rename Gateways to DAO and restructure
packages