Updated structure in prep for adding hibernate