Restructure sanad.web
Better JPA support