Moved bean definitions to root context, moved persistence config to new file