move database-sync-session into bundle
refactoring