Move 'model' package to the 'dao' one
Make session close safer